First thing you need to do is service your secondary and put TS/slippery washers in it and you should do it before its time for your first service. Yamaha's oem grease is definitely not up to spec. You can add a 0.5-1mm shim to your primary. This will make up for the 4% loss in gearing and some of the added tire weight.CV or clutch 1st?