1990 Jeep YJ Smog Check

I have a 1990 Jeep Wrangler 4.2L that I have been trying to pass smog in CA. The Jeep has been running pretty good for an old vehicle and my mechanical experience has been growing vastly since I have had her. She is running 33's w/ stock gears.
Here are the Max and Gross polluter limits
15mph (HC-124(MAX)311(GP), CO-0.75(MAX)2.05(GP), NO-1020(MAX)1807(GP)) for
25mph (HC-104(MAX)261(GP), CO-0.95(MAX)2.25(GP), NO-880(MAX)1607(GP)).

Here are the results of my first test.

15 mph (RPM-1984, %CO2-13.9, %O2-1.0, HC-102, CO-0.53, NO-1965)GP
25mph(RPM-1902, %CO2-14.0, %O2-0.9, HC-105, CO-0.52, NO-1870)GP.
They said the high NO had to do with my EGR system. So I looked at it and the plastic nipple from the EGR temp switch was broken off, so the EGR had no vacuum. I fixed that w/ super glue and EGR gets vacuum and diaphram moves when revved.

Test2
15 MPH(RPM-1952, %CO2-12.3, %O2-0.6, HC-198, CO-3.44, NO-114)Gross P
25mph(RPM-1905, %CO2-11.9, %02-0.6, HC-201, C0-4.02, NO-99).

Now its running super rich. I went through all the vacuum hoses and replaced an re routed them per the vacuum schematic in my chiltons, and now she is idling super high, like 1300 RPM. I'm stuck, does anyone have any idea of what to do?