You can also keep the same luff length, same mast, and just add the square top, shorten the foot to keep the same sail area.
Then rake the mast back a little to compensate for having moved the Center of Effort (CE) forward (by reducing the sail area in the aft part of the sail, increasing the sail area in the forward part of the sail).
Gary
