Thanks to all of you who've responded. this is helpful.
I've tried, unsuccessfully, to find a dealer who would flash the anniversary edition tune to my car, knowing that this would accommodate the larger MAF holder. The tune that I got from Vivid (VRTuning) ignores the o2 sensors, so it doesn't work to get me past the IM station.
I may determine that, as much as it's a PITA, it may be most simple to swap back in the 986 maf holder for IM testing, and then swap it back out.
(spare me the "save-the-earth" lectures.... look up what "lean condition" means)