I'm a long time cycle commuter and you are spot on. If your lane is obstructed, switch lanes. So much safer than just hoping you won't get doored.