Go ahead and replace the thermostat first. If your engine isnt reaching operating temp the ecu is going to stay in open loop which enriches the AFR, meaning you're gonna get worse fuel economy than if it were in closed loop.