2" is WAY back at the step. Having the mast that far back at the step probably makes any rig tune guide useless-the recommended headstay length (35'-10 1/2") is probably much too loose with the step in that location. You probably have a huge amount of pre-bend in the rig. I would recommend setting everything per the class standard (step at one inch back, heavy air rig tune at 40/40, headstay at class max). Then play with extra pre-bend by wedging the mast forward at the partners. I have found that the boat balances quite well upwind with those settings (and maxed out halyards and outhaul). What is your rig tune set at usually?
