[dannobee]

As you said, oil thermostat and oil pressure switch. Also the fitting that the oil pressure switch screws into. I'd try to look back there with a mirror and a flashlight, or a remote camera/borescope tool.