Time for some updates! Yesterday I took the boat out for a shake down run and couldn't be happier. For the motor swap I cleaned up the wiring which was a bit of a mess, redid all the plumbing in stainless braided line with AN fittings, relocated the batteries, mounted an electric fuel pump, relocated the diverter pump, and plugged the exhaust holes. I spent way too much time on the diverter bracket, exhaust hole covers, and fuel pump mount, but I'm happy with how they turned out.