Gee whiz, if it's the original setup, and it used to run fine, what kind of Maxprop issues does he think it is? If one of the blades isn't feathering completely I'd expect you'd sure know it via hellacious vibrations when in gear. Maybe send a diver down first for a look see? Unless there's other stuff you've been wanting to do with the boat out of the water...