I am thinking your choice of the right sail maker and using whatever they suggest would be the ticket. I just had new sails built by smyth for my 20, he chose a radial cut.

Call whoever you are planning to use and ask them their thoughts. Then report back.