??C30 Points of sail, trim and tuning??
A couple additional thoughts:
Many boats will not sail very well to windward under main alone.
If your sails are old, you will get more heel since older sails are stretched and are difficult to flatten, which will reduce heel. That brings up another point - as the wind increases tighten the outhaul on the main in order to make it flatter.