Why not add the Corsairs / Farrier trimaran classes?
They can sail cleanup
(if the regatta could use a bit more safety/insurance/towing an offshore dis-masted cat/or fallen crew pickup?).