I second you suggestion. When I was on hiatus in the US for 6 months,
I brewed my tea using "spring" water in the jugs you can get at the
grocery store. Keep in mind that some brands are better than others,
but I got much better tasting tea than when I tried to use tap water.