New Motherboard for upgrade or just upgrade to Ryzen 7 5800X3D

I'm working on upgrading my PC which has a B450M-A motherboard, a 2060, and a Ryzen 9 3900X. I just upgraded my PSU from 650w to 1000w and GPU from the 2060 to a 9070xt.

My question is, is it worth it to upgrade to Ryzen 7 9800X3D or Ryzen 9 9950X3D, knowing it would mean spending the additional money on a new compatible AM5 motherboard and DDR5 ram. I also have some interest in getting multiple m.2's as mine is 1tb, but that could be upgraded separate.

Alternatively, I could keep all the same components, save the cost, and just upgrade to a Ryzen 7 5800X3D which still uses the compatible chip set with my motherboard.

I'm not against spending the extra chunk of money, but if the performance gains will be minimal (I mostly play CS2) I don't know if it makes sense. I play at 1440p on a 144hz monitor, and want to upgrade to an oled 240hz or higher monitor at some point also.