What is your water pressure at idle? If it is below 5 psi at idle and does not move to around 10 psi at 1100 rpm, it still could be your water pump. Yamaha tweaked the housing design. If that is it, do a complete update of everything on the pump. Simyamaha.com has a complete kit that includes the housing. Torque everything down to spec and check it again. That's what fixed the same problem for me. I had barely measurable water pressure at idle before and 5 psi after. Mind you I would jump up to around 20 psi running before the change, so everything looked fine except at idle.