I would investigate that emissions tune on the tuner, it might make things much easier in 2 years when you have to go again... I have a normal tune and an emissions tune on my SCT for my 99 Saleen. When I know it's time to go for inspection, I reload the emissions tune about a week or so before to give it time for all the monitors to go ready.
99-122 Bright Atlantic Blue S281 S/C Convertible
11-025 Grabber Blue S302 Convertible
Saleen - Power in the hands of a fool!