Replaced the CPS and so far so good... no bucking and it starts up really nice. The true test will be driving back and forth to work over the next week.
I think I even managed to locate the one wire in my steering column/ignition switch that causes the Jeep to randomly die. Now I just have to redo the connector and I'll no longer have to be ready to throw it in neutral and restart at any point