I'm struggling a bit with water too, I've found I'm nursing an icy cold (well at first it's cold) lemonade for most of the day. I try to use water as a "chaser", a few sips of the lemonade and a mouthful of water is working for now.