Personally, I'd investigate exactly what type of damage you're dealing with from the hydrolock. If you have to replace a significant number of parts already, then it may make more sense to go all motor, as the cost of using the extremely high-end parts necessary for all motor won't be a huge pile more than what you need on stock replacement parts anyway.

Likewise, if there's not major damage, and it just needs a small bit of work, then going with a supercharged or turbo setup may make more financial sense.