'86 740 GLE Wagon, non-turbo, approx. 195K miles.

Having recently moved from AZ to OR, I am now trying to get our Brick to pass the tough OR emissions standards.

Since it needed one anyway, I replaced the distributor cap and rotor, then the spark plugs (gap set correctly), and air filter. But it still failed.

My Total Hydrocarbons are 4.63ppm and the standard is 2.00. FAIL
My Nitrogen Oxide is at 7.67, but the standard is 3.70. FAIL
My Carbon Monoxide is 16.5 and the standard is 32.0. PASS
There is no tailpipe smoke, and the car seems to run fine.

I am currently soaking the Fire Trap in fuel injector cleaner because it was very clogged up. Could this be the culprit, or is there something else I should check? I know a bad catalytic converter could be the cause, but I don't think that's it. I ran the car hard for a half-hour on the freeway before the test.

I'm at best, another fool backyard mechanic who can't afford expensive mechanics to poke around and charge me while they look for the cause. So, I depend on you great folks to give me idea. So far, you're batting 1.000!

Any ideas? Thanks!