Hi Greg,
I have been thinking about your problem. Now that you have sorted the rudders, has the weather helm also occured since you have been using the main you got of Matt? If so scarecrow is pointing you in the right direction, because the sail is much fuller than your old sail. So will probably require more downhaul, as this pulls the draft forward and opens the leech of the sail. I think I mentioned to you about a minimum downhaul setting I use on my sails upwind as any less causes too much weather helm.