Not sure where you are, but in the US, the rule is to stay right in the first place. Not get over once someone is coming. This avoids all the problems you mention.
It's just that people don't do it, and have little incentive to. Part of what I'm suggesting is that you should have to be ultra cautious anytime you're in the passing lane. Which is an incentive to quickly get out of it.
This type of regressive behavior is disgusting. When someone tries to pass I now have to be extra careful about switching lanes because they may pass me on the right. This leads to even slower switching which fuels even more passing on the right.
Just follow the damn rules.