Battery swap is probably not the way. My prediction is charging times will get much faster with better battery tech in the next 5 years. We might be able to get a full charge in under 10 minutes - which starts to match the convenience of a gas fillup.
I don't see manufacturers agreeing on a standardized battery pack size and shape. I also don't see battery swap stations getting built to the density needed, even if only as a supplement to charging stations. Battery swap stations would be significantly more expensive to build and maintain than charging stations.
Regardless, we don't have battery swap, and I don't think any (serious) manufacturers have plans to go that route, so it's a moot point.