1998 Ford Windstar coolant in oil

When the problem happened I noticed I was not getting hot air from my heater. I removed the radiator cap a saw a brown foam at the rim. I checked the oil dip stick and it was a bit high and seemed watery. I am not seeing any smoke from the exhaust. I think it is a head gasket problem. I let the van sit for a few weeks. I was going to drain the coolant and oil and try something like Bar's head gasket fix. When I started to drain the coolant I saw that it was green and clear without a hint of oil so I stopped draining it. I started the van and let it run until it was at normal operating temp. The heater was now working fine. I checked the oil again and there is definately water in there. Bottom line, should I try the gasket fix?