Always control the main, sheet in and travel in coming into the gybe and ease it out slowly coming out of the gybe, this means you have control to de-power out of the gybe.
Thanks for the suggestion. This is exactly what I started doing this week -- especially in spinnaker-less gybes while getting in position for a start -- and the boat feels much more in control.
