I have the same issue described by the OP, and find a N-S, and the some "windshield wiper" strokes work best for me. Essentially, my second pass is diagonal, but more circular, holding the heel end...