I cant say my 16 sq works that way as I found I had more weather helm the further back I rake my mast.

However I would recomend checking you toe in and out of your rudders and also see if your hulls are aligned corectly its possible one has shifted or is set incorrectly. Once forward pressure pushes the bow down it may be digging in on a bad angle and pushing the boat upwind...
As to the correct setting for the toe in and out I can't help you but perhaps someone else may help answer this?