CEL? maybe I am too green to be on here... I would consider replacing the thermo as well. You can check the mechanical workings of your temp gauge by pulling off the lead that connects to the temperature sender (located on the thermostat housing) and ground it. If you ground the lead the needel will move all the way up to H, have someone sit in the car and check it out.

-Tom