Yeah, the CPS failing is pretty common, esp. in AW4 automatics. Good thing is, it's a relativley easy fix. NSS switch on your shifter might crap out soon too.
Enjoy your XJ, though. There'll never been another vehcile quite like that, though. Combination of simplicity, durabiltiy, incredible engine, solid axles front and rear, real Tcase, and relative affordability... All good reasons to stop making them, right? <sarcasm>....
The 4dr JK is an interesting "evolution" into what an XJ might have become, and they're selling so fast they can't keep 'em on the lots...