Id say the shape of the Spi looks OK.

However, you don't have the windward hull flying quite high enough;

I'd always say 3 inches too high is better then 3 inches in the water !

As Rolf asks who are you loosing out to ?

F16 - GBR 553 - SOLD

I also talk sport here