My idle problems resolved when I replaced the idle control valve and its associated rubber air flow parts.

Note there seems to be many different part numbers for these idle control valves, need to get the correct one.