I used to drink caffeinated drinks a lot until I realized it made my anxiety spike, and it also made me sleep poorly at night, so I quit cold turkey and started drinking tea (the variants without caffeine and similar stuff). Right now I mostly drink a camomille/honey blend. I used to drink only camomille but the honey gives it a sweet edge which I like better than straight up camomille. I also like fruity teas, such as mango and green apple.
Tea is the only hot drink I drink, but I hate that it's hot? When I'm thirsty I want to drink my tea NOW! (What is this "anticipating on the thirst" you're talking about I have never anticipated anything in my life.)
(Speaking of tea variants, it took some getting used to that stores outside the Netherlands do not sell carbonated iced tea.)