87 trouble smogging, please help

I'm in California and i've tried to smog my car several times. The timing was off on the engine, got that fixed. Then the mechanic(s) recommended replacing the O2 sensor and catalytic converters, did that. Most of the numbers are way down now, but the results don't make any sense. The last test (before the o2 sensor and the converters were installed) it only failed in the area of low RPM HC. Today it failed on high RPM HC. The guy said this means its running rich and fuel isn't being burnt. What do I do now? I don't want to give up on RX-7's. I put good fresh gas in the car, the plugs have only a few hundred miles on them, all maintenance is up to date.

Hold on... there is a vac line you can remove and plug. Then try emissions...

My car is having trouble passing emissions, but I have new spark plugs, filters, cats, etc. What do I do?
J-rats Recipe for cheating emissions if its ABSOLUTELY necessary:

1. Turn variable resistor to full lean, or as lean as you can get and still run.
2. Trick ACV into pumping air to the cat all the time by removing the FORWARD UPPER vac hose, and capping it.
3. Run 87 octane
4. Run your tank down till your almost empty.
5. 2-3 bottles of alcohol in the tank. Drive VERY GINGERLY to the emissions station.
6. Once you pass go, DIRECTLY to a gas station and fill up with regular unleaded.

Thanks, i'll try that stuff if necessary, but I just realized my dumb ass forgot to reconnect the air pump hose. I can't believe the tech didn't notice.