What happens to water has little relation to the problems of oil - except in that water is polluted by oil in
- spills from extensive, widespread deep-sea drilling operations (most of them not even reported on MSM in America)
- transport and pipeline accidents
- the disposal of waste products and runoff
- tar sands production
all of which affect the quantity and quality of water available all around the world , plus, specific to the US
- imminent threat of repealing protective legislation from national parks and wetlands
- imminent threat to all water sources by defunding and/or defanging the EPA
- and striking down all other federal regulations
That has nothing at all to do with other sources of energy, which do not, at the present level of deployment, significantly reduce the abuse and misallocation of water.
In time, there may be some problems with generating energy from tide and wave power; that's not known yet.
But it won't affect the serious problems already besetting farmers in India, Mexico and China.
http://blogs.ei.columbia.edu/2011/05/05/how-china-is-dealing-with-its-water-crisis/
China alone has the government clout to make a coherent policy and carry out a long-term plan. Canada might have the motivation, but there is too much high-powered opposition, and I imagine the same applies to Australia, South America, Mexico and most of Africa.
The US doesn't even want to anymore, apparently.... democracy at work.