The obvious solution is to make batteries easily swappable.
Not really. Electricity itself is far more fungible than battery packs. Not only do you have to devise simple, safe and quick ways of doing the swap, you're going to have non-trivial infrastructure for charging and storing them – protected from theft – and probably the need to ship them around. I think the company that wanted to do this for cars folded, but I could be mistaken. Much easier to build charging points even with dedicated MW lines.