Just a thought, if you are in Lake Forest you should go see Jack at MPD in Costa Mesa or Greg Shoemaker in Corona. These guys have been in the business of hot boats and racing for years and could probably help you iron out your challenges. I have heard that Jack gives a lot of free advice. If you want to do the work yourself maybe you can invite him to lunch (you pay) and pick his brain.
I don't know, it can't hurt to ask.
Brian