I think the world will see a larger energy mix. For instance, the hydrogen might not be efficient yet but once you connect the hydrogen plant to a nuclear power plant (hopefully fission in the future) then it doesn't have to be efficient. because you require the hydrogen as a "mobile" energy source.
And for cars, there will probably be
- more techniques (they are making that system of energy storage in those toy pull back and let go cars for real cars at traffic lights for instance)
- mixes of techniques (part electric and part hydro or part biofuel)
- Selection depending on the functionality. (In heavy populated areas a second "moms grocery" car can easily be an electric car. You don't drive huge distances in it).
Similar for houses, it will probably be a mix of:
- solar,
- wind (those small windmills you start seeing in cities these days)
- earth heat
Things like that.
We probably will be shifting from a very one way energy source to maximising efficiency of all energy sources.