for the idling problem maybe clean your AFM or get one off a mate with the same year/model as yours and try that in there & see if it goes away

i had a similar problem & it was the AFM