Another possibility would be to add massive storage to the grid. Maybe it's pumped hydro or this kind of thing: https://news.ycombinator.com/item?id=8646787. Or perhaps more realistically, if someday soon there are millions of electric vehicles connected to the grid at any given time, especially during current off-peak hours, that storage could be leveraged for load shaping.