Coolant in the oil - AGAIN!

Ok, today I got it all back together - I used a whole load of RTV around every port there is on the intake. I opened up the drain plug on the oil pan and about a quart of water came pouring out. I let that drip for a while and mopped up as much as I could on the top end. Put the intake back on, snugged up the bolts and let it sit for half an hour or so. Then I went back and tightened everything up.

I ran the water pump first, then checked the oil. It still looked like oil.

Then I fired it up and ran it for about 30 seconds, shut it down and checked the oil. There was a bit of a milkshake look to it - but not much - but I still freaked. Then I realized that there was probably coolant sitting on the top of the motor and that made it down to the pan once I ran the motor. I checked the coolant level, then re-checked it again half an hour later and it didn't budge a millimeter, so it's not actively leaking. The gaskets are still dry, so it doesn't seem to be leaking any more. I drained the oil (third time in two days), it didn't look anything like what it looked like yesterday so the amount of water in the oil is signifigantly less.

Tomorrow I'll change the oil filter (again), fill it with fresh oil (again) and run it some more to see if the oil stays clean this time.