Any Toyota Techs on here?
Could it be as simple as a faulty thermostat? First it was hot on the highway and cold at idle, now it's hot at idle and cold on the highway. Changing symptoms means something is behaving erratically.
Print