I do the same thing, unclip one foot as I approach a potential stop. If you're able to keep moving, you can straighten your foot and clip it back in with a very small movement.