Re: The solution is still nuclear.

George 'road to Damascas' Monbiot likes Integral Fast Reactors. Solves the waste problem, but not the proliferation thing. I also believe you can 'burn' Thorium in them.

http://www.guardian.co.uk/commentisfree/2011/dec/05/sellafield-nuclear-energy-solution

Further reading that claims breeder reactors count as 'renewable':-

http://www.sustainablenuclear.org/PADs/pad11983cohen.pdf