How much money do you want to spend?

If you have the cash, I'd do a foam core, carbon tornado main hull, (using your tornado mold) with a couple of Acat foam core carbon ama's. The whole package would be much lighter and stiffer than some old hulls. It would probably have better resale value as well.

Forte mast, he can make a pear shaped mast in sections and you could glue it together. He could ship it to you in two parts.

Forte carbon beams

Thats the way I'd go....

But I've been accused of having a carbon fetish.

Bill