You're spot on re: the water quality. An investigation at DFW a few years ago found hazardous levels of e.coli in the potable water tanks used to refill aircraft.
I wonder why the airlines aren't doing anything about this. I'm not a frequent first-class passenger, but if I were, high-quality coffee would be a big deal for me.