Here's a trick. Any drink can be enhanced by just adding a good quality juice to it, be it Gatorade or whatever. Here in So Calif, there's a thing sold at Costco called "naked juice". To me it has fantastic flavor, maybe not 100% fresh squeezed but above average.
When filling your water bottle, top it off with the "naked juice". Just a few ounces will greatly enhance the flavor.