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.