Yes, water does tend to break sown the oil.

What does the oil on the bottom of your dip stick look like? If it is all milky too, you may have head gasket problems.