Yes.
Yes.
The shock from the other source will always take precedence since it's stronger than any of your Oath of Spring shocks.
It clears all the shocks and calculates the damage based on their total magnitude.