Isn't pumped hydro-electricity a solved problem for off-peak energy storage? Granted, only for countries with hills/mountains (not the Netherlands etc.)
You still require a place to pump that water into. Forming a lake isn't exactly a very ecology-friendly thing, and as much as you'd love to drown <city>, requires absurd amounts of work.
