I had the same problems recently. Bought a new Sump and had it baffled. Installed a PWR heat exchange Oil Cooler. Water Temperature light came on about the same time as the Oil light used to! I have now installed a 30% bigeer Radiator, at the advise of PWR and will have the opportunity to test it this Friday! I'll let you know how it goes. You might also want to check your Sway Bar brackets hanging off the front Chassis rail! - Two Track Days had them bowed, bent and twisted! I am having them custom made! It would appear 1950kg of Car puts some considerable stress on other components at Track Days!