Worked on taking apart the intake system and cleaning up the MAF sensor to see if that cures the idle bounce. I inspected all the intake hoses and the hose to the secondary airpump. No signs of tears or holes of any kind. Put everything back together and idle was steady around 600-625 using the secret menu (option 7). I'll continue to monitor but looks like the MAF just needed a cleaning.
Looks like I am off to the dealer for two airbox lid clips

Both fell down into the engine compartment. I couldn't find them at all looking from the top. Decided to remove the lower splash guard...What a PITA! Whoever designed that thing was a moron. Why must something be held on by six 10mm bolts, and eight 8mm bolts...To sum it all up, the clips weren't even down there...Oh well there goes another $8-10 to buy two new clips.