Don't know if this is worth considering but...could the water have entered the pan when you were taking the head off and the quick dumping you observed was the thermostat opening up?
I hope all the shiny stuff doesn't start to rust since there was so much water in the oil. I wouldn't want to leave it long before addressing that.
Dennis
