I think abundance of energy solves this problem. We shouldn't depend on natural sources of water, when we can desalinize, recycle, distill, and condense from air. All those actions require energy.
imo there is an energy crisis, not a water crisis. The energy crisis is easy to resolve, just let people like me, inventors, do their job without making their job impossible or disappearing them. Oh, and funding, people should fund research. I have solutions for the energy crisis, I just need financial resources.