Pump storage is indeed very cool. However if one would count it twice when it is produced by solar and then again when getting it back from the storage, then that would majorly distort the statistic. You’d effectively count the produced amount of energy double (minus whatever efficiency loss you have from storing it).

If batteries are charged by renewables, then counting the battery output as renewables is fine, as long as you don't count the charging. Same for pumped storage.

The point though was that existing hydro can be enhanced because it runs at spare capacity. Compared to dedicated pumped storage projects.