Wegmans sells sugar-free sparkling water in 33.8 fluid ounce bottles, so -cheapskate that I am- I get those, drink their contents, then use tap water to refill as necessary.

I think it took me about a month of focusing primarily on water to get it down. FlyLady was right about new habits taking at least a month to really become ingrained.

I'm the same way about eating when I'm thirsty. Looking back on it, it is hard to believe just how many calories I was putting into my body when I was avoiding water!