rg- not sure if this will help, but I had this problem of surging. Hotter the motor was, more common it would be, mainly only notice it at idle. Turns out the PCII had lost the map basically and the mechanic at the shop loaded a new one & was good to go. 10,000 later & 1 year still all good.