Mostly all of our potential for pumped hydro is already developed, and there is not a lot left to do for non-pumped hydro.
We can't grow hydro at the required scale, and the usual problem with solar and wind (that we should develop nonetheless, don't get me wrong) apply: we can't produce enough power with those all year (winter nights need power too for heat pumps etc...)
Wind would be particularly effective in Switzerland and it's fast to deploy. The swiss grid has less than 1% wind which was pretty shocking to me. It seems like Switzerland has a particularly bad renewable story for an EU nation.