I'd try lowering Decel Enrichment and I'd look at the vacuum part of the fuel map.
As you shift have someone watch the AFR and which cell(s) is active during the shift. You may find you need to remove fuel from that cells and those surrounding it. (most likely the whole load column).
Now, are you seeing fireball when you get back on the gas? That could be throttle pump.