Have you tried salting your water? Just salt to taste for some extra electrolytes. It’s very refreshing and now I don’t like water without salt. Also keeps me away from other, lesser beverages.