Re: maximum rpm
Boats are commonly sold with the "wrong" prop for the customers application. Are you running the boat at altitude, is the motor mounted at the proper height, are you running with a load (anchor, coolers, extra battery, etc). All these come into play when selecting the proper prop. Now, add the fact hat it is a 20 year old motor and probably doesn't have the power it originally had, and the prop probably isn't in pristine condition and you find yourself with an over propped condition.
Bottom line is that you need to prop for your current conditions, but I would only do so after tuning the motor to make sure it was delivering what it could.