Hey Rob,
Good to hear that things worked out.

Personally, unless you can 100% trust the person who maps your ECU, I dont like the idea of adding a Whipple to an EFI engine. Some guys here have a system where they can map the ECU themselves, but its not a Merc ECU. Ofcourse, unless you are real careful, you know what happens. I still say thats what ate your engine last year. Maybe I am living in the stone ages, but I prefer a good carb., easy and simple to get the fuel correct.
BTW, forget about that stock Bravo 1 with a Whipple. Sell it while it is still worth something and get an Imco or an XR.