Andinista,

May I offer a couple hints?
1. Tighten the rig - Use the mainsheet by traveling down to the end of the traveler track, sheeting hard to loosen the shroud then repin. Make sure the shrouds are in equal holes and the rig is in column. Tight is faster.
2. On all three mains I used, the traveler car on the mainsail wanted to be kept forward upwind for a tighter foot and better overall sail shape - avoid over rotating with a loose rig.. Be like a windsurfer and downhaul, downhaul, downhaul the mainsail & keep that jib luff tight especially in Force Five. Check the rake of your diamonds and the tension - go for aligned prebend. In - column is faster on both tacks and balances the helm.

That reminds me - ensure the main beam has prebend built in via the dolphin striker. Tighten the nut for the rod under the main beam until a slight prebend is present. This allows for more rig tension and saves the main beam.

... also, we found our mast would rotate better if we placed a thin plastic 'bearing' in the mast base to resist friction...

I wish I still had my boat now