CMOS logic is actually really simple and easy to understand (from a functional model of ideal CMOS transistors). Indeed a water analogue shouldn't be necessary if one wants to understand modern gates themselves.