water in oil after heads swapped

Did you use embossed steel shim intake gaskets. Personally not a fan of those things. Another possibility could be that the intake vs heads angle is off. If the heads were surfaced and the angle wasn't right, the intake will be difficult if not impossible to seal. You can check this with a digital protractor.