Replacing the t stat housing is the best choice IMO because odds are that one is going to warp anyways.