this is gonna sound weird, but pull off the pipe for the intake. There are 2 holes inside the TB. With it running, plug them one at a time with your finger. I promise you won't blow your finger off. If that smooths out your idle, mess around with the wiring, and the placement of your Map sensor. It should take care of the problem. I had the same problem jsut taking my engine out, and putting it back in. If it dies when you take your finger off, don't worry. It's normal. Just restart it and start messing with wires again.