Sorry to hear about the failure. At least you have a few months before boating season to get it resolved.
I would look at the Volvo D4 260hp diesel. Would give you great performance and fuel economy. Would probably get a bit more space in your engine room too.
If your going to the boat show both Hyundai and Mercury have V6 compact diesel options.
Not sure price on these so may be prohibiting.
Good place to talk to all the manufacturers though.
You could look at podding it too. Talk to the guys at Waypoint Marine in Seattle. 90% of the new Sea Sports are coming Podded. They could install for you. Honda or Yamaha Outboard.
Good luck!