Good choice on the scooter. Yeah, wait till the bike is broken in before doing the dyno. I wouldn't have the dealer do it based upon what I have experienced. Ask around for a "good" tuner in your area. As far as the visual mods you want to do, it's the look that you want. Get a set of freeway pegs, a back rest, change the hand grips to something more comfortable and the theme that you want to carry over to the footcontrols and floorboards.