The entire point of hydraulic hydro is that energy capacity scales by r^4 (dimensions of the piston + height within the hole). It is possible to just carve out the piston head from existing rock with wire saws. Systems with 1.6TWh storage capacity are not impossible.