Americans are drinking more water. How best to contain it: That’s the burning question.