Energy storage is indeed going to be vital once solar exceeds 10-20% of capacity. Energy storage, fortunately, is also dropping fast in cost:http://rameznaam.com/2015/04/14/energy-storage-about-to-get-...
I have future posts coming with closer looks at the future of storage prices, wind prices, and possibly one on nuclear.