IMO what is needed is a standardized battery system and a short range emergency battery you can carry in the trunk with say- 30-40 mile range like what you have left in the tank when the "low fuel" light comes on.
I have been seeing a few cars backed up to a charging station near a large grocery store here. Plug in for 30 min so you can make it home. :rofl::rofl::steering::steering::steering: