It is dreadful to even begin to contemplate the prospect of water wars.
While the issue pops up occasionally and is pressing to various degrees in several parts of the world, much less is known of real policy/ies being implemented to manage, mitigate or overcome the macro problem altogether.
Despite instances of acute shortages, it would seem to me that so far water scarcity is very localized. It is mostly tackled in ways deemed as pragmatic rather than scientific. Such approaches do fix the urgency of the minute but hardly address the structural issue, if and where one is identified. Here a line must be drawn to distinguish between droughts on a return period and the unavailability of water.
There have always been regions prone to water scarcity for natural reasons.
Climate factors cannot be micro-managed or reinvented which is why large human settlements set down on fertile soils close to river banks, water bodies or areas of regular rainfall.
To answer a troubling question, I'd say that I do not envisage a water war as such.
There will continue to be water conflicts and strife at local and regional level. The clashes may perhaps scale up in seriousness, tone and frequency. The geographic location of potential conflict should remain largely unaltered. Unless the root-causes there are dealt with meaningfully to literally quench the thirst permanently.
The top priority of policymakers is to heed the call from those who have already closely studied the problem. Their conclusions, recommendations based on science, practicalities and volumes - natural and both human and material - must be taken into account building feasible long-lasting solutions.
If humans can get it all right, it will still be Mother-Nature having the final say...