Pokey,
Spread your water consumpyion throughout the day, starting with soon as you get up. I drink on water all day and it isn't a sloshing feeling or uncomfy, it's a lifestyle. It will become one for you. Your body will start craving it and saying YES YES YES!!!
I tend to hold water too but not when I am eating right, avoiding alcohol and drnking proper amounts of H20.
So drink up!!