Batteries still have a long way to go, I'd say at least 20 years for better range, power, recharge cycles, recharge times, et al. Electric motors are pretty much as good as they are gonna get, unless something revolutionary comes out.
Even Hydrogen is still far away. I'm hoping ALIENS will...