Whatever you want to do buddy. If your going to rebuild its definetly time to go ahead and get the oil mod done. I have the Athena on mine and it runs great. It does run a little hotter than a stock bike would but mine has been flawless so far. I have the Athena kit with a set of Hotcams, DR.D pipe, a K&N filter and a big thumb runs great lol Go ahead and Switch to Amsoil and Engine Ice if you plan on doing anything to the bike