88 yj 258 swapping to 87 xj 4.0 couple quick ?'s

[Ol_Blue]

I have an 88 yj with the tired 4.2/ba10-5 setup. I bought a running driving 87 xj with a low mileage jasper 4.0 and recently rebuilt ba 10-5 trans. I know externally the case of the trans is different. My Peugeot doesn't stay in reverse on its own so I was planning on using the guts and bellhousing of the xj trans in my yj when I do the 4.0 swap in a couple weeks. Using the 4.0 flywheel, bellhousing, etc saves me from having to run a crank sensor relocator kit correct? Also as far as the swap I know I'll need an electronic fan and a fuel pump. Anyone here ever grafted the stock xj pump in yj tank? I have a manual steering yj so I'm just going to pull the pump from the 4.0 for now. Is the 5 wires to fire still the same on the renix setup as it is with the obd1? Anything I'm missing? Thanks!