Brita!

Filter all the water, all the time.

If there are still occasional marks, I recommend PEC-12 and the little PECwipes very highly.