We should put our transport system up in the stratosphere. Unlimited solar energy, shorter distances (up and over versus traveling along the surface of a big ol sphere), uninterrupted habitats down below, etc. The scientist's just need to nail that dam space elevator.
Trying to make an energy source like sun-power conform to our outdated and combustion based infrastructure is never going to be terribly effective.
I think electricity generation needs to get away from the whole grid system at some point.