Have you considered the Beta Marine Engines? I've heard good things about them. Just a thought.
The problem changing engine manufacturers is the different dimensions, shaft length, prop size, and hose placement. etc. Our last repower evolved into relocating the hot water heater, new motor mounts, new shaft ( shorter), cutlass bearing ( the shaft was out anyway), relocating coolant tanks, and replacing control cables because of change in throttle location and transmission shift lever.
Each costing more in parts and labor. I'd keep it simple with a like kind engine.