I think batteries with the help of nanotech will eventually reach energy density approaching liquid fossil fuels, will probably be another 10 years though.

BTW - A couple of my friends recently started a recruitment company for scientists in the Oil & Gas industry, I'm helping them out with their branding/site and hosting. Would love to get your insight on what they're doing right and wrong - http://discoverinternational.com