Which engine would be easiest for my swap?

Well the EFI part, the 96+ will have OBD II so it clearly has better scan tool support. If you plan to leave it bone stock then maybe you can get by with the OE ECU.

If I'm being honest, I would throw the OEM computer in the trash and run a Megasquirt of some sort to control the remaining parts.