I would get a dechlorinator like Stress Coat, it instantaneously makes tap water safe.