I did the 4.0 HO swap (From a 91) in my CJ. I bought a wrecked Cherokee for $550 bucks and sold the parts I didn't need for $500, so an engine and tranny for $50 seems like a pretty good deal. I bought the Hesco wiring harness for ~ $500 which made the install pretty much plug and play. Since it's a newer motor and I installed it wit all the factory emission stuff it should pass the test in California.
°lllll° Am I broke yet??
1985 CJ7 With HO 4.0 Conversion