I never wake because I'm thirsty, rather the need to lose fluid! However, I've got into the habit of drinking a large glass of water before bed and another first thing in the morning after my first cup of coffee.

After a ride, especially now in the high heat and humidity down here, I make sure I drink a lot during a ride, then drink a 20oz pint (yes, we have bigger pints in the UK and I still use them here!!) of water or water/electrolyte after a ride.