All I can add is that I once experienced similar problems, and switched to bottled water (some glaciar Scandinavian water, but you probably have similar bottled water) and the problem slowly corrected itself.
I'm not saying tapwater is your only problem, just sharing. Also, bottled water can have bad stuff too (bad PH, sodium / salts etc).