Put the Tornado back in and be done with it.

Faster, stiffer, and even 10-15 year old Marstrom components remain competitive.

Oh, by the way, Marstrom's carbon masts don't break from being sailed. They're designed to be sailed. Try sailing a Nacra 17 in 25 knots.