Exactly this. The concept of "battery swapping" is at least as difficult as the concept of "engine swapping" (for someone else's engine, at that). It can be done, but you're dealing with a very large, heavy component critical to vehicle structure, with sensitive connections, and very high value, which high stockpiling requirements - multiplied by the number of batteries on the market. And mandating that everyone use the same battery pack will never fly - not out of stubbornness, but because different vehicles represent entirely different capacity needs, power needs, form factors, price ranges, etc, and the technology is a constantly moving target. The sort of battery you're going to put in a 2wd luxury sedan is not the sort of battery you're going to put in an electric jeep, which is not the same sort of battery you're going to put in in a sports car, which is not the same sort of battery you're going to put in a delivery truck, which is not the same sort of battery you're going to put in a motorcycle... (continues ad nauseum).
Battery swap is fun to prototype, but it's not at all practical. Faster and faster charging is the way forward. Which BTW comes inherently with increased capacity. If you go from a 100kW pack made of cells that can charge in half an hour to a 200kW pack made of cells that can charge in half an hour**, then you're going from charging at 200kW to 400kW, and doubling the kilometers-range-per-hour-spent-charging.
** - Pretending that charging is linear, rather than fast in the beginning and slow at the end, for simplicity's sake. ;)