I am sure you have your bottom in tip top shape, but I had you point out that you should fair your keel and ruder to the templates, and don't neglect the bottom.
You said your rig is tight, you might experiment with loosening it for light conditions. We have heavy air settings, moderate air settings, light air settings and setings for "why are we sailing in this light stuff"
I feel that we are at a disadvantage in light air when compared to many boats, but we really come into our own when the wind picks up. I think you are doing the right thing by footing when going to windward and sailing higher angles downwind in the light stuff (the polars also show this to be true)
