I just honestly dont think there is an upgrade!! Just another bike to fix all the time!! Any bike is gonna have issues and you really havent had many issues, at all, just general maintenance, thats a pretty darn good bike youve had and definitely one of the best looking ones out there!!!!Never said I was going Yami, I'm just sick of fixing the 04 ZX all the time. I barely ever get a chance to ride ride her! It's definitely time for an upgrade!!