I would like to think the best way for Storage isn't a a giant battery somewhere ( although we could certainly do that with Hydro Dam ), may be something like a Tesla Powerwall that could work 20-30 years minimum, minimal to zero fire risk. All the homes could then install their own and take advantage of the cheap electricity price at night or in other hours. It would ultimately serve as the biggest buffer to any surge in energy usage.