Vic-you are 9/16" too far aft with your step. That is HUGE! If you move the step forward to the 1" mark as per class rules, the point of headstay attachment on the mast (i.e. the hounds) will move almost 5" aft. This will add rake (obviously) but will also decrease prebend, decrease headstay sag, and will generally help your light air performance. Also-all the standard rig tune settings are calibrated to having the step in the right position. So the rig tune settings you have been using up to this point probably have been way off.