CAMARO6 - Exhaust setup changes

I’ve got a full cat-back exhaust off a 2019 ZL1 with one cat cut which I have.

I’ve also recently had what I believe is the AFM valves going bad: Sound

My AFM valves are apparently different where they do not have an actuator like the SS but instead are like spring valves?

I know the ZL1 exhausts is 3” which is bigger pipes then stock v6 so my ideas are:

A: Weld the cat back onto the ZL1 exhaust and bolt into place as if it’s OEM. As the ZL1 exhaust doesn’t have the AFM valves.

B: Cut the v6 exhaust before the AFM valves and replace from there to tips with the ZL1 exhaust.

C: Cut after the AFM valves and hope the issue is fixed with whatever TSB I can find and do myself

Edit: I went with option B, no issues after months of driving