I've been wondering if one solution is having dual plumbing in some houses, that includes a parallel system for non-drinkable (but otherwise clean) water.