water in the oil

I agree with the coolant system pressure test. The kit to do it is fairly cheap and a must have tool in my opinion. You can also pull the plugs and look for one with water droplets or that is very clean (steam cleaned) compared to the others. If you have new plugs in it this wont tell you anything.
What all was done to the engine before the oil showed up? Did you have the heads off?