I figure I'll close this thread out for posterity. I contacted Rock Auto for a replacement for the NTK sensor and got one with the same connector with the wrong shape. I was emailing back and forth with NTK for a couple weeks but they haven't returned my last few emails. I think they just made a bad run with the wrong parts or something. Rock Auto did have a MOPAR sensor so I went ahead and bought it and installed it, and... it didn't fix the problem. At that point I got frustrated so I just found a local shop that specializes in Jeeps and took it to them. Turns out it was the camshaft position sensor the entire time. Once that was replaced the engine is running as smoothly as it ever has so I presume the sensor was deteriorating for a while before I realized it. I am a little annoyed that they decide to tie both sensors to the same fault code, though.
