Battery storage is possibly going to fit in there, but it doesn't do it yet.
Tidal, ground source, gravity/momentum/compression/latent-heat storage solutions, some of these might do.
I think we need at least one more cycle of Nuclear power plants.
Perhaps then we'll have workable fission.