Is my understanding of current, voltage, and resistance correct?
You are trying to mix sound ideas, voltage being work per charge, and voltage being a potential, with poor ideas that are worse than the water analogy, resistance 'restricting' flow for instance.

The water analogy is pretty darned good, at the level it's intended for, in spite of the fact that water is nothing like electrons. It models well the energy changes around a circuit, and relates pressure to voltage, charge to volume and current to flow rate. That's usually enough to satisfy most folks.

The next model up in terms of 'realism' is the Drude Model. While attractive on the surface, it adds little qualitative descriptive power, and makes such poor predictions for the behaviour of some actual conductors that you have to go full QM to get any correspondence with reality.