I think he is asking about the trans to transfercase connection.....the motor would not be in the equation.....but your years are correct.
That was when the trans to tcase spline count changed - for the 4.0.
When the spline count changed for the 2.5, I don't know.
If he gets a NP231 from an early 4.0, that will have the 21 splines.