Solar and Wind - these are the 2 best sources. And best because we don't harm nature or plunder nature for energy. I hope technology also improves to store and re-use energy generated from these sources through nature-friendly methods.
As you've identified, I think every surface that faces the sky should be installed with Solar Panels.
And the government should make the support improvement to solar panels transparent and promote recognition/deduct taxes for people who:
(1) Install solar panels at home / office
(2) Businesses that install solar panels and use batteries to store power for their use
(3) Spend that extra research to buy Electric/Hybrid cars - that use less fossil fuel and have bare minimum exhaust fumes
Especially in Australia, I see that most automobiles are over-priced and hybrid cars are more expensive (due to technology) whereas the government rebate should make them cheaper encouraging people to buy hybrids/electric cars!
I believe solar is the way to go, wind is awesome but I remember reading not that long ago that a large wind farm - I can't remember where now - had actually slowed the planet's rotation down. The amount it slowed was infinitesimal, but I couldn't imagine the consequences of hundreds of solar farms might have. Solar seems to have no ill effects on the planet, there is an unlimited supply. A new study I read a couple of days ago declared that at our current global usage and with out current solar technology, we could actually harvest all our power needs via solar if we tried, our species just isn't trying hard enough because we are so addicted to fossil fuels.
I believe solar and wind energy are the two least damaging. Unlike geothermal energy or hydropower, which require some desctruction of ecosystems, solar and wind are pretty harmless. Moreover, solar panels are easily fitted to rooves, so no space is wasted.