Yes the tranny will fit.. I fitted the 88 2.3 tranny into an 84 with zero
problem... All I had to swap out was the flex disc flange as the later one
had a thicker one.
The diesel will fit right into the body with no problem... only thing you
have to do is update the ignition lock module so it can turn on and off