The wild card is what happens given the additional atmospheric water capacity in a warmer climate. The more aggressive monsoons is one example that seems will only get worse.
The recent catastrophic floods in Europe add some data points to the pessimistic side. The additional capacity materialised as torrential rains which cause flash floods but don't help that much with aquifers.
Anyway, the practical upshot of that is that different infrastructures do better at capturing and releasing water and they have to be tuned to the water transport mechanism for optimum effect. Changes in the climate that change water transport are likely to invalidate existing infrastructure "design rules" and existing infrastructure built for a different water transport cycle will be less effective resulting in less net water delivery.
Wild right?
[1] https://www.nationalgeographic.org/media/technology-rainwate...