> I'm not a frequent first-class passenger, but if I were, high-quality coffee would be a big deal for me.

Many transatlantic and transpacific flights now have a proper grind-on-demand coffee machine (allowing for lattes, cappuccinos, etc) in business / first class. Doesn't necessarily solve the water problem, although they can fill them up from bottled (I don't know if they actually do).