Wow. I'm liking the concept a lot. However, it sounds like you could dedicate your existing water system to non-drinkable water, and add a serious filter/reverse osmosis/still that had a separate spigot dedicated to drinking water. How about a separate reservoir for processed drinking H2O?
Have you figured how much drinking water you need for a week?

Keep us posted on your project.

Do you have solar panels?

Ned Hall