Don't both.
Something it seems is telling the IAC to open too much in error. In my case it was the MAT that was bad and the ECU was using bad MAT data to over open the IAC. Have you completed the hot/cold water tests of the MAT, ohms readings after cleaning it? If it is to dirty it will not respond to air temp changes fast enough.
Take that info I sent you, read it, study it, and then retest the sensors live, while running, especially when the high idle kicks in, as that will be when the bad data shows up and finally lets you isolate the gremlin. Also, you still may have bad sensor ground splice(s) in the harness, that are changing ground resistance when the harness moves, or thermal changes affect the loose splice-ground in the harness. Pay special attention to the MAP and MAT grounds, and TPS sensor ground on the ECU side of the TPS. The TPS has two separate grounds!!!
Also, does the IAC have a good o'ring? I am assuming it does, but?