Talk about leaving everything to No. 99!
Im doing exactly the same thing (apart from the rally next month!) with the american WR 450 I got, apart from the lights (HID), water tank (to be fitted underneath), suspension (upgraded), and I´ve forsaken the rear fuel tanks for now.
I´ll be following this thread very closely!