According to the 87-90 parts manual these are the part numbers for the gear shift lever assembly:
AX4/5 XJ/MJ gas 83500518
AX4/5 XJ/MJ diesel 83501407
AX4/5 YJ 83503110
AX15 XJ/MJ 5252042
AX15 YJ 5252055
So AX4/5 and AX15 are different.
The bottom piece is either the incorrect one for an AX-15 or somehow it's 180° off. This is mine as it exits the trans it bends towards the front, the shifter is in neutral in the picture.
Here's a pic my wife took as it began (there was on and off cloud cover), we only got ~79% coverage here, you can see some sun spots on the surface. She used an 800mm lense with a solar filter.
Found them, if you want pictures pm an email address, I only have photobucket and you know how that is at the moment. It's yours for $5 shipped first class in a padded envelope. Pm if interested.