Mixing the water and oil is not that likely as there is probably only one oil channel from the block to the head, so the head gasket would need to go at that location for it to mix. Better look at the coolant level and check if the systeem pressurizes more than normal.