I'll suggest models from North/Tushingham. You could go for a Duke/Storm (wavier crossover sail) or an Xtype/Tbird (no cam "slalom"). Other brands also have similar sail lines.
Just don't pair a Kombat with anything cambered/race sails.