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.