I too hate tap water but find it can be bearable if you chill it. I have a Brita Water filter jug that goes in the fridge, so I filter the water then pour it in a glass with slices of lemon or lime. Sometimes I add some ice if I've forgotten to refill the jug in time.
Some days I resort to the diet drinks. I don't have a sweet tooth so I'm not someone who has ever found it makes me crave sugar. Savoury has always been my downfall