Okay, just returned from testing on the lake and the engine issue has been fixed. I installed a new OEM pump kit and the water stream was much better at idle and at higher RPMs. The old impeller was most likely cavitating resulting in an overheat and triggering the temp cut out switch.