I have the same swap in my 84 Scrambler. I used a 99 TJ 4.0 motor, 95 XJ aw4, the novak adapter/clocking ring that they worked with me to make. I used OBD1 since it was easier to swap in. I put my fuel pump in the tank and used the two wire speed sensor. Everything has worked out very well. I blow away the yearly emissions test and get about 21 MPG on the highway. I used a 93 XJ wiring harness under the hood and a blended cj/xj harness inside the cab since I used the XJ steering column. The XJ column gave me tilt, delay wipers, light switching on the column, and cruise control.