I suspect also that your mast is blocked all the way back in the partners to compensate for the long headstay. Also check where your mast step is located. Along with the forestay length these three settings will conspire to create a frustrating boat with a lot of helm that is hard to get the main trimmed right in different conditions.
You can't imagine the difference when you get them dialed.