mbalhuizen,

I am amazed that your boat didn't come with a rotation limiter.
The Inter 18, 20 and Nacra F18 have one.
Does the mast have two through holes just above the boom mount?

Without a limiter your mast must be be rotating way too far forward when going upwind and killing your performance.