I did not know weber did some custom work AMC/Jeep....Learn something new everyday :idea:. Maybe superJ and I are on the same page (I think). You could swap a couple of things to improve emissions, but it's time consuming and can get costly. I also am not sure how close you'll get to your states requirement. My 85 has a Weber 32/36, High-output Electronic Ingition (HEI), a cataylic converter and a Nutter bypass across the stock emissions computer. I had no problem passing Maryland Emissions, only to find out I did not need it- Historic Tag route.
I good place to start would be pull the spark plugs. They tell a good story about engine performance.