I love the dip-and-dive teaching strategy. Totally borrowing that!
I have sometimes adapted Wizards Walk to make it a Mad-Robin-esque figure, facing your partner across the set, to eliminate the challenge of walking backwards on the reverse:
1s step forward (close to P) & slide sideways down the middle while 2s slide up the outside.
1s step back (kinda like back into long lines) while 2s step forward and everyone slide the SAME direction, past future Ns (1s slide down the outside, 2s slide up the middle)
Reverse: 
2s step back into long lines while 1s step forward (close to P). 1s slide back UP the middle while 2s slide DOWN the outside.
1s step back into long lines while 2s step forward. 1s slide UP the outside, 2s slide DOWN the middle).
It has the same oscillation; you're just sliding sideways instead of facing up or down and walking forward for the first 2 passes and backward for the reverse passes.  There's less crashing into others.