Correct. The proper comparison is the hydro with the batteries (my comparison with the solar was for indication only. Both the hydro and batteries can store energy and then convert that stored energy as usable electricity (admittedly the battery's native electricity is DC, but that's getting into technical semantics)
