no reason to go carb if you want to stick with MPI as stated, just re-map your existing ECM
you could also switch to closed cooling at the same time.
no reason to go away from the alpha. you do need to run a rev limiter. not when in the water, to shut it down when wave jumping.