Losing my mind with P2096/P2098 errors after a tune

hotshot

So I got a stage 2 tune from Z1 motorsports in October last year. Went really well until last month, I got the SES light on the dash. Checked regular maintenance and everything is good, ran the codes to find it's actually P2096/P2098. Here are my mods:

CBE with resonated test pipes
Resonated HFCs
Z1 2.5" Cold Air Intake

So these errors are from the HFCs, right? Is it actually running lean or is this related to the O2 sensor? I reached out to the Z1 tuner and they will not deactivate or change the codes. I'm trying to learn about this and the solutions seem really ambiguous. I'm pretty new to this as you can tell.

I have some thoughts, but no idea what will actually work. Spacer/defouler for the O2 sensor? Revert to stock tune temporarily? Put the stock cats back on temporarily?

I really don't know. I'm trying to pass inspection and I'm losing my mind trying to troubleshoot. In my county they use OBD2 for emissions, so I need to clear the code and ideally find out what exactly is wrong. Any feedback would be really appreciated