I think the Whirlwind is the way to go. Less square top and inverse the roach and make it flat with a lot of luff curve. That way it fits strait onto the boat with all of the usual trim components.
But a two mast choice would be better. I have always been surprised they don't do this.