Welcome to the forum!
The apparent overheat may have been due to some trapped air in the cooling system from when the water pump was changed, if you're lucky. That would not explain something that could give the impression of oil in the cooling system. Could it maybe have been something like a leak sealer that was used to slow or stop a coolant leak from the water pump prior to it being replaced?
-Rod