Solar thermal with either graphite or molten silica should definitely be in the mix too.
A change of government and a price on Carbon will speed up change and both are looking likely
It is somewhat ironic but about 2 weeks before the blackout in South Australia. Solar reserve proposed building six solar thermal power plants near port Augusta in Astralia. These would be similar to their Crescent dunes facility in Nevada. Crescent dunes has 1GW hour of thermal storage and has slightly exceeded design specifications. If built all of these plants could easily work with the currently existing wind and increase renewable penetration without increasing customer costs. And if the utilities signed long term contracts with fossil generators they would have enough backup for the days when wind and solar ar not enough.
http://www.adelaidenow.com.au/news/sout ... plants-to-[url]create-24000-jobs-create-power-station-in-massive-boost-for-states-energy-needs/news-story/1803b172eb5e003d367df13c8bcd3bb5[/url]
http://petedanko.net/tag/crescent-dunes/