Drink a half gallon of water a day.
Do this for three weeks and see if you feel better(?) or how you feel..
After 3 weeks I've got some results/conclusions:
Once again it was only 3 weeks and I didn't expect any miracle in terms of changes. And this wasn't a double-blind experiment or anything, it was just me drinking lots more water. I didn't intentionally cut out other drinks but as a result I probably drank less (but I know of some days I drank as much I just had to force the water down later). Some of the above could be attributed to being tired or stressed from work (it was the start of the school year). So no big results other than the sleeping I'll be keeping an eye on that.
I will continue to drink more out of habit (I already am today), but I won't be forcing myself to catch up in the evening.