It's likely that baseload and renewables will meet half way. Supposedly, adding a small amount of battery capacity to wind turbines dramatically increases their power output predictability.

http://www.technologyreview.com/news/514331/wind-turbines-ba...