> 2) the PSU on my PC started tripping the AFCI (sent back to the manufacturer and got a replacement).

That's a common occurrence with an AFCI breaker and a switched mode power supply.

In my last apartment, I had multiple AFCI breakers nuisance trip with multiple PC power supplies, usually when the GPU has heavy usage.

Eventually I "solved" it by getting a double conversion UPS.