I hate to say it still sounds related to the Primary throttle position sensor, but that's exactly what it sounds like... still. I had the same symptoms and had the TPS replaced at about 35,000 miles. I'm at 43,000 miles now and have not had the problem reoccur. The exhaust isn't the culprit. I was running TORs/cat bypass and now I'm running Jardines.
I do know that the Primary TPS and the Secondary TPS are exactly the same, except for wire length. A couple of people have had success swapping them out I believe, but you have to have TuneBoy software to calibrate the TPS correctly, or have your dealer do it.