I had the exact same problem and posted about it; got some great advice.

Now I have a large cup, holds 4 cups of water. I fill it with room temp water first thing in the morning. I keep it at my side and just pick it up and drink. When I think I can only take 6 swallows I push myself to ten. Midday glass one is gone.

Often I'm still struggling with glass two late in the evening. BUT, it's a contract I've made with myself and frankly, I don't think I'd sleep well less I finished it.

Like most things about this WOL, water is a decision.

Good luck to you!