Why not make the hydropower the usual last step of the process (so there's always a continuous stream of water flowing downhill through generators that directly supply the grid with power), and use wind etc only for pumping that water back uphill to sustain that process. The power generation (wind or whatever) can then fluctuate all it wants so long as over time it pumps enough water on average up to keep the hydroelectric generators fed.