Holy hermaphrodite Jeep PM!
Good luck with this one. Since the 86 CJ would only had a 2.5L or a 4.2L finding a quick fix for this is gonna be tuff. You may want to scrap the current butcher job, and start a new one. There's a couple of place I know of here in Pinellas that prob have some past experience with Jeep Hodgepodge.