I disagree, electricity is a lot cleaner. Before you start about the powerplant...I have rather one point of toxic going into the air...which is a whole lot cheaper/easier to filter/clean than all the fumes internal combustion engines put out everywhere they go. The price you (the consumer) pay for petroleum is not nearly enough for the real cost (the real cost includes the renewal of the material you use). The same can be said for wood, but that is a whole different topic.
Actually, if there is no hydro power generation possible I would say to build more nuclear power plants, they are the most efficient ones (price/performance wise (and that includes the environmental risks)).
It looks like there is something good happening for the people in the hydrogen camp. Scientist have created/found a new material (graphene) which is unbelievable strong, even when it is only 1 molecule thick. Besides that, it is also an excellent (semi) conductor (graphane). Because of its strength it is ideally suited for hydrogen tanks. Actually the strength of the material comes from hydrogen. When this material will become cheap enough to produce, expect a boom in hydrogen powered stuff...and even smaller CPU's. From the article I read (on a Dutch website) it looks like it is ideal to replace silicium.