The EDTA in (some, all?) Suave Naturals conditioners is also supposed to remove hard water/chlorine from the hair.
I looked into the shower filter, but we are on a well, not a municipal system and don't have enough water pressure for it.
Experimenting with too many products to name here. All this great info keeps my head spinning.