It's surprising what will make one of these motors run like a turd. Like on mine, I had replaced everything you have and far far more, and what was making it run awful (lumpy, down on power, uneven idle and hesitations) was... the charcoal canister?? When I disconnected the line to that from the intake manifold, it ran perfect again. Well, the new crankshaft sensor did 99% of the make-it-better work, but that charcoal vent line made up that huge 1% difference.
Not suggesting that for yours, just that from all my own reading and experience now, the strangest things make these run better or worse. Just start yanking things off and blocking holes and seeing if ANYTHING changes...
Triple check the vacuum lines, specially the one running to the MAP sensor as it has those hard molded angles and can crack or rub a hole through pretty easily on the underside where you can't see, and then it will totally mess up the sensor.
I just get a feeling it's going to be some devilishly simple thing that you probably don't even consider. Seems to be the XJ life lol
Love the look of those sunny's on the red, making me wish I'd splurged for a set on my black heep. Bigger fish to fry though, my front driveshaft decided to turn into a one man drum band while I was doing a hospital run with my mum, had to yank that... full time 2wd now heh.
Good luck mate, you'll get it. Wish you were closer I'd come give you a hand. Can't say I get out that way much these days, been many years since I was in Blackall with my old man to do a deal on an XY GT someone had stashed away. Back in the good old days when you could go knock on someone's door looking for old cars and not just get a gun pointed at you