Robert Zubrin punches the numbers and says the hydrogen economy is nothing but a hoax.
He concludes that the only other viable fuel that is available now and can take advantage of existing petroleum-centric infrastructure are Ethanol and Methanol.
But I still think the answer is to build a better battery.