Tony,

If you can flatten out the sail it's a good sign that you have plenty of scope to get upwind speed in light wind and heavy wind. My old sail couldn't do that so I was always losing out. If your leach was too tight you would have been hooking it and stalling. More downhaul and less mainsheet tension should work in those conditions. Good luck.

Regards,

Peter