FYI, the price of lithium-polymer batteries is steadily dropping at about 7% per year for more than decade.
At some point in near future, it shall be simply CHEAPER to build typical commuter car with 200km range fully electric. It is cheaper to run them and maintain them even today.
IMO, that will be the real point of peak oil - simply because demand will start to drop.