I had one a few years back,
ran fine on water hose, go to the lake would not go over 2500rpm.
After switching out everything you can imagine,
Mercruiser said change the spark plugs to NGK's
that the high energy ignition was breaking down the factory plugs...............
Bingo ran perfectly.
Your getting more rpm could be something else,
Did it ever run properly?