Careful with too much water--drinking too much can alter your electrolyte balance. Finish drinking your water a little earlier, and hopefully you won't have to pee in the middle of the night!
I have the opposite problem--for some reson I don't *want* to drink water, though I need to stay well hydrated to take advantage of my medications, and help my one ailing kidney flush out toxins. Anybody got a good suggestion for this, aside from force??!!