raking the mast forward one or two holes would help weather helm. the drive issue would be sail shape more than anything, need to look at where the draft in the sail is and how much twist you had..