Problem is electricity is kinda three different things, as far as models go.
1) DC; 2) low frequency AC; 3) Radio frequency circuits
With DC, the water in pipes analogy is close enough to be useful.
With low frequency AC, like mains electricity at around household voltages, there are additional considerations to make the water in pipes analogy to be useless enough we generally require people to be licensed to work with it.
Radio frequency electronics is indistinguishable from magic.
The pipes analogy gives people a wildly unrealistic idea of the speed of electron movement in a wire. They only move a few mm/s at max current in copper wire. Electrons take minutes to go down the power cable from your PSU to your GPU. At GHz frequencies, they move less than an atom diameter.
How come? It seems it is very analogous to water in a pipe. Let's say I have a 30 m long garden hose. The water in it moves (in the order of magnitude of) 10 m/s in it. If the water is turned off, and I hold my thumb at the end of the hose and turn the tap on, I feel the water pressure almost immediately (the speed of mechanical waves in water). So it is obvious that there are two speeds. One is the speed of propagation and one is the speed of the medium, and they are way different.
I agree that water analogy doesn't belong in this category because technically it works, but disagree on it being easy to visualize or pedagogically useful. Unless you have really solid understanding of hydraulics/fluid mechanics you are just trading one poorly understood subject for another.
It's quite easy to get the solid enough understanding of hydraulics/fluid mechanics since it's something you can see/touch and easy to visualize. Kids love to play with water, a few experiments at school/home and they quickly understand it.
You can feel pressure and see flow rate. They're way easier to understand than voltage and current. Hydraulic accumulators are a real thing. There's even a freaking hydraulic equivalent of a boost converter! It's an amazing analogy. I'd say even calling it an analogy sells it short - it's not "like" electricity; it's exactly the same but in a different domain.