I understand that not all was merely diluted. The point really is that both types were consumed by the Faithful and that the Scriptures merely prohibit drunkenness.
Temperance is the Biblical norm, not prohibition. Even John Calvin and Martin Luther the virtues of the consumption of wine.
The scripture does prohibit drunkenness. Not sure you can make the case that both were consumed by the faithful in Scripture beyond those few that got drunk.