Shoot, I forgot to include time frames. We did all that work last weekend (waterpump, thermostat, ECT, coolant), hoping to fix the first issues. It's been running warm since.