Oooh, excellent detective work - both the "oh hey those are symptoms of dehydration" and the "am I assuming water in cup equals water in me" links. Hope you can work out a new hydration regime that helps with the obnoxious symptoms.