Might be worth checking/replacing the fan clutch before pulling the thermostat. The fan clutch can be replaced in under 30 minutes and fixed my overheating issue.