Yes I agree with you. Often the thirst indicator is delayed. By the time you start feeling thirsty you already heading toward dehydration. To avoid this as you said, you should drink at least 1 glass of water upon awakening and throughout the day.

Also its very important to have a glass of water but after sex.