I would recommend a hydranet radial sail. More expensive but keeps its shape much longer than dacron. Hydranet is a woven sail, made of a dacron/dyneema mix; it does not haven the disadvantages of laminate
sails like sensitivity for moulds, shorter life and so.
Furthermore I'd strongly recommend a 3rd reef. I feel that above about 23 knots TWA close-hauled you need a 3rd reef. Reefing lines can be accomodated by adding extra blocks at the foot and collar of the
mast. I added 2 double clutches left and right of the original clutches on the coachroof, to accomodate 3 reefing lines and the
outhaul.
A square top sail has advantages (more push at light winds, 10% extra
boat speed) but you have to reef earlier; raising the sail is a bit more cumbersome due to the battens hooking behond the lazy jacks; and the
danger of an accidental gybe due to wave action on the
head of the sail is larger. So a gybe preventer is necessary in more cases.
And take care that the reefing eyes at the
mast are large enough to let the reefing straps go through. Incidences uses too small eyes at the mast side of the
mainsail.