Had exact same problem, changed IAC & TPS also w/o success. Unhooked neg post for 5 min... Voila, smooth idle. Wish I had seem this earlier!
Right before the problem started, I went to start the X and released the key too soon with no start. Re-engaged the key and started. didn't seem to catch right away, but fired off. took about a mile of driving before I noticed the high idle with bad shifting and more braking at stops. Don't know if bad start was cause or coincidence??