What about flavored water like Propel? It comes in all sorts of different flavors.

I also like Arizona tea that comes in a variety of flavors.

Or how about brewing your own tea and making iced tea?