Forgot to mention: I switch my feet after completion of the turn during the upstroke. If my back foot is close enough to the front strap, I just move my old front foot to the back, move them both into straps, new front first. If standing too far back, I will move old back foot closer to the front strap or even into it first (while still in the opposite front strap).
It may not be pretty but it works for me.
