The day you get rid of a Honda and get a yamaha you always win in my book. Cylinders don't sound like they have much life left in them when they need bored again. That being said you will get to go bigger, bigger is always better. Don't do anything until you fix the leak, and make sure It didn't cause any damage first. I have a feeling it just might cost you a little bit to get it running properly. Once it is though...it will be worth it.