Congrats on joining. I have an 88 2.5 with a TBI and just found a 90 2.5 being parted out. So I got that harness from the guy for $50 bucks to replace my spliced up one. You can search craigslist or here in the classifieds to find parted out jeeps. Quadratec is offering older harness's now for around $850 new. I will see if I can get you a part #. To the best of my knowledge and what is in mine, the air cleaner is a square box with the hose that has a round top with four securing tabs on them. The filter is square not cone shaped. Not sure if you can use a 91 and up filter and housing havnt checked on it. You can find one in a junk yard (cleaner and hose out of a 87-90 cherokee. Just saw one the other day at the local pull a part for $10.
I would say you can have my old one that I spliced together and ran for 8 years. But dont know if you would like that in yours that you are working so hard on.