I think I can help a little.
The water analogy can work up to a point, its ok for simple DC circuits.
Think of voltage as potential, technically voltage is called the electrical potential (symbol E as in E = IR, Ohms law). Now in mechanics and the water analogy, potential is the difference in a height, so a higher voltage is partly equivalent to a greater height difference between the positive and negative terminal (battery). So think of the battery having a pool of water at some height above another pool of water.
A connection across the battery is equivalent to a opening in the side of the top pool of water that allows the water to drain from the top pool to the bottom pool. Once all the water drains out the battery is discharged or dead.
A heavy piece of wire (low resistance) is like just totally opening the side of the top pool of water. Lots of water flows down in a short time. The amount of water (volume) that flows in a fixed period of time is equivalent to current flow from a battery (and through a circuit).
A resistor in the water analogy restricts the flow (current or water). This is equivalent to a pipe with a smaller opening in the top pool of water connecting to the bottom pool. The height drop is the same but less water flows out of the top pool in a fixed period of time.
Hope you are following.
So, the voltage or potential is across a circuit and the current is the number (volume) of electrons per unit time. With the water analogy one could connect the upper pool to the lower pool by a tube or pipe. The diameter of the pipe is inversely equivalent to the resistance of a resistor (small pipe gives a high resistance to the flow). Even if you have several pipes connected together (series resistors) the flow at any point in the pipe is the same.
As to what each electron is doing and how circuit components effect them is a bit beyond my ability to easily explain. Maybe some one else can.
Did this help?