Doh! Just barely missed the gem at the end.
Tweaked some numbers and am much happier with how the sailing handles. Can finally do a full come about without grinding to a halt! I'm starting to realize how interesting its going to be designing levels around the wind direction.