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.
“Life is a trick, and you get one chance to learn it.”
― Terry Pratchett, Nation