Have you thought about getting a rigger to check your rig tune ? When we first bought Raven she was damn near uncontrollable in a gust. When we had our standing rigging replaced and the rig tuned as part of that exercise, she came back a boat transformed.
"Do you think God gets stoned? I think so... Look at the platypus." Robin Williams.