Talk a bit about the second picture
Is the front bolt tight or torqued, leaving the rear one gapped like that? If yes, then you will need to spotface both mounting bosses on the BJ.
But before you spend money on that operation, check the pin for tightness and turning torque; maybe the joint is just plain junk. The pin HAS to rotate reasonably freely, else your steering wheel will not return by itself, instead you will have to manually return the wheel after every turn....
and WORSE is you will have to make constant steering corrections, as the car will go in whatever direction it is pointed in without exception.The constant wander will become intolerable.