RAG- You did clarify things for me. I suspect a good bit of it is the old rust coming back. I'd really overkill the "B" step and clay/bug sponge while it's dwelling. Actually, I'd call AutoInt and see if somebody like Ron can help with some suggestions. Ron doesn't get along with everybody, but he and I always got on fine.
IMO the admited hassle of claying while the "B" is dwelling would be well worth it. I did it on our minivan, so it's probably doable. Another similar idea I got from Ron K. at AutoInt is to use a bug sponge while the "B" is dwelling. Wasn't about to try that on *my* car

but you might want to experiment.
You can let the "B" dwell a bit longer than the recommended time, or at least it didn't hurt anything when I did it (I'd better watch it here, just because it was OK for me doesn't mean it'll be OK for everyone else).
I'd do the "B". Rinse thoroughly. Then redo the "B" and clay the worst areas. Then consider repeating a few more times, but of course that'll go throught the "B" stuff pretty fast too.