For our store we just took on a new kid on the block. Whirlwind Sails in San Diego is making great sails for the Hobie Wave and makes sails for any Hobie design as well. Battens from your old sail fit perfectly into the new designs.
Not HCA legal, but they are legal for IWCA (Wave Class).

And the price is right.
Rick