I never thought I could reach a point where I just drank tap water and was happy with that (I was addicted ti diet coke at one point) but I have (and I never drank tea or coffee anyway as never liked them). So do stick with it and it will all come good.

Bonus is tap water is virtually free of charge.