Speaking as one who has very little experience - I didn't drink at all until in my 50's, and very little now, you're right. On a hot day a cold beer can really cut a thirst.

You might try sparkling water or club soda with a strong shot of fresh squeezed lemon or lime juice in it, enough to make it kinda sour.

I don't much experience with Anne's herbal teas, but I get a lot of loose black tea from Upton Tea Importers. They have literally hundreds of kinds, and lots of herbals, very reasonable.