Best of luck with the new arrival - I've the same bike and am currently changing the end can - They say that the top end is restricted by the factory can. There is meant to be a cdi unit that can be upgraded - I can't find it anywhere.
Keep her rubber side up.