I thought that the whole F16HP box rule concept allowed people to chop and change between sloop and uni-rig by removing/adding the jib. This adds a great deal of versatility to the concept as we don't always have a crew available, plus for teenagers growing in size allows them to keep the same boat. You may believe you have trademark with producing uni-rigs, but I think that you just producing to a specific market niche which is limiting your overall market.
The F16 class is about to vote on amendments to the current box rule design and the 8.5m looks likely to be adopted. Why continue with a 9m mast? Owners of the new Bim won't be able to compete against other F16s on an equal basis making the Bim a less attractive offering.
In regard to your new boat, why not buy an A-class and add a spinnaker? But you have already done that with the F18HT.
JC