Yeah, same. I've found that cutting off my water 4 hours before sleep lets me sleep better. Otherwise I'm waking up 1 to 3 times in the middle of the night with a painfully full bladder.

I'll still take a couple sips before bed, but it's just enough to keep my mouth from getting dry and no more.