Good solid goals! It'll be a fun cruiser, though you are probably best to start collecting manual bits asap :P
I'd definitely look at some fuel management for the long term. From memory the factory tune gets incredibly lean at high RPM (Or rich, cant remember exactly, it definitely swings from...