How long did you let it cool for before you added the water?
2 gallons of cold water could thermal shock the metals of the engine.
Most definately change the
oil and filter, keep an eye out for coolant loss for a few days, then flush and change the coolant.