If you're going to be buying a new sail, now's the time to go prebend. Talk to the folks at Whirlwind sails about getting it cut for pre-bend. If they won't do it, talk to Calvert or Glaser or whoever. You may find that a custom designed sail is not much more money than an off-the-rack one.