One thing on thermostats. Toyota brand has a jiggle valve. Most after markets don't. I'm not sure just what that jiggle valve is supposed to do, but I'd guess that it would help when bleeding the system of air. I've used after market thermostats successfully, but I always make sure it has the jiggle valve.