1996 MJ build, fuel pump question

[RockRodHooligan]

I have (most of) a 1989 2WD MJ which me and my step son are going to build as his first car, we have a 1996 XJ which we are using as a donor to make the MJ whole again. The MJ to my knowledge was parked some time in 01/02 and hasn't been driven/started since, I do not know why it was parked. The truck was missing the dog house, the engine compartment and bed were full of walnut shells, and there was a rodent nest in the glove box. Rather than chase potential mechanical and electrical gremlins, I made the decision to do a full H.O. swap from a newer XJ, I let the kid decide if he wanted a 97 and newer, or 96 and older, he wanted 96 and older. I made the decision to use 96 for OBD2.

This weekend I went and picked up the donor 1996 XJ we will be using, I know most of the swap should be fairly straight forward, the exceptions being the rear brakes to delete the ride hight proportioning valve, the wiring behind the seats for the lights and fuel pump, and with it being a 96, the fuel pressure regulator since the 96 has an in tank regulator. It has been a few years since I have owned an XJ, and even longer since I've dug in to anything this technical. 

What are my options? Will the the 97+ fuel pump/sending unit with the 96 fuel system so I can mimic how the 97+ builds did their fuel tanks? Or will I have to use a 95 and older style regulator at the fuel rail? Will this interfere with the OBD2? I would like this be as OE fit/finish as possible.