I do about the same. According to urine color, I stay pretty well hydrated most of the time. The trouble is dry mouth. If I don’t drink a glass of water at bedtime, I’ll have bad dry mouth all night and have to wake up and sip water every hour or so.
I get nighttime dry mouth too - even “watering up” doesn’t stop it so I keep a glass of water handy and if I wake up, I swish some around to moisten things up and take a few small sips.
Tried the dry mouth remedies and they don’t work for beans - 30 minutes after using them, my mouth is dry again - funny how it only happens at night.