Even with battery tech improving (and true solid-state batteries eventually leading to a big breakthrough), they'll probably need to develop a quick-swap system. Deekster already mentioned Tesla's system, and something similar for racing cars would be needed.