Keep drinking until your urine is clear. Personally I like to hydrate over a period of hours at a moderate pace. When I've woke up thirsty in the night like you were describing I always figured I was still dehydrated.