Been sailing the boat a lot this summer on our Wed nights here in Sarnia. There have been a few nights with left over bump and little breeze. A few things that we are relearning are, 1) Twist, Twist, Twist! I have moved the lead forward a car length to round the foot up but then ease jib sheet about an 1-1.5" past my normal upwind jib mark. Then on the main it is trav all the way up, outhaul off a "fist" width and eased the sheet so that the top batten tell tale is flying like 75% of the time and the second batten tell tale is flying like 95% of the time. Then you just foot, foot, foot. 2) I have been using a speed puck but as mentioned it is all over the place. Mostly because of current in our area as it is GPS based. 3) a bit of extra heel and crew weight forward also seems to help.
One other thing is that in the really bumpy stuff I have not been letting the rig tune off much. I just find that it bounces around to much if that makes sense?