Hi Hooky
I had a 17ft Wilson Flyer that was very heavy built as a one off. It performed badly with a cheap 45HP on the back so I fitted a new 60HP Yamaha. Wow what a difference, great after that.
Are you sure that the Yamaha has a terminal problem, does it look cooked by overheating?
Or is the the water flow a minor thing.