I think you should just go and read the wikipedia articles on countable and noncountable nouns and stop arguing with a literal inguist.
I think you’re too rigid with your definitions. I just showed you an example of where water, usually not countable, is used in a plural form in real world usage.
Regardless of whether the noun is countable, the thing itself (water, air) absolutely is countable, i.e., comes in discrete measurable amounts, which is the more important issue here.
you used a HOMONYM because words can have different uses. “water” meaning an amorphous fluid of dihydrogen monoxide vs “water” meaning discrete bodies of water. You can count bodies of water but you cannot count how much water is in your glass. If you want to use water as a countable, that’s fine, but you would be using it in a way that most people don’t intend.
I am really confused why you think you can’t count how much water is in your glass? Can you explain that?