Powerstroke214 try unplugging the ICP sensor when the choppy idle starts. If it goes back to normal its probably the ICP sensor or the ICP pigtail.
I had the same problem so i changed the ICP sensor and that didn't fix it, so I changed the pigtail and that was the problem.