It not going to be the oil and sounds more like a thermostat or temperature sensor issue rather than overheating as if it was too hot it wouldn't clear as soon as the fan kicked in.
If you get hold of an infra red thermometer and leave the car idling you can check the temp of a convenient radiator or hose. if it's around 190 - 200F the cooling is OK.
