If you've got a Comptip, then I wouldn't recommend a square-top sail. The top section of the mast is too bendy.
When Hobie made Mylar sails for the 16 (1991 - 1996), racers figured out pretty quick that the Dacron sails were faster, especially in light to medium air. They last longer, too.