Right on. I have had the water problem lately. We have had drought conditions and some of the trails I have been on lately were lacking in water. I used to carry dehydrated water, but now I have to carry the real stuff and it can get heavy. To me nothing is worse than being thirsty at night. I would rather not cook and save the water for my thirst when it comes to that. I am not familiar enough with your area, but it sounds as though the water is just something that you have to deal with.
I may have to get a camel if this drought continues.