2.5 to 4.0 t-case shifter

[wiggamoe]

I'm in the middle of a 2.5L to 4.0L swap in my 95YJ.
95 YJ
4.0 from a 95XJ
AX15/NP231 from a 97XJ Sport

I was about to bolt the t-case, tranny, and engine together when I noticed that the 2.5L t-case shifter won't work for the AX-15/NP231. The holes in the shifter don't align correctly with the studs that screw into the shifter housing. The hole on the side of the AX-15 is about 1.5" too high from the holes in the t-case shifter.

Of all the 2.5 to 4.0 writeups I have read, the only thing that relates to the t-case shifter is that the XJ's mounts to the body, while the 2.5L mounts to the AX5. If I purchase a YJ 4.0 shifter, will it work since the AX15/NP231 are from a XJ? Let me know, thanks!