Cam/Head Swap Disaster.......

To get the water out of the oil passages and engine, I would:

BTW, just a thought on the pressure blowing past the filter seal: if the water in the oil got heated enough in the pumping process, it might turn to steam and then the pressure out of the pump and into the filter would shoot way up. I personally would just assume that some odd process like this occurred and getting the water out will fix it. When you prime it next time, then make sure you have a mechanical oil pressure gauge installed; that may tell you if the relief valve is stuck closed, if the drill can spin the pump fast enough. It ought to relieve pressure around either 55 or 72 psi. If the pressure is way high, then you can take off the pan and look into the pump, but a stuck relief valve is not common.

Aren't cars fun !??!