Before you replace anything else, maybe you should look into preconditioning the vehicle for the cooldown calibration?

If the evap is already cold, it will fail it everytime. Unhook the battery and do a hard reboot, then precondition the vehicle and perform ... Login to read more.