new 5900XT or go to AM5?

Hello, I'm massively uncertain of what CPU to buy, need help ASAP

My current build is very modest, I'm willing to put on it 1k-1.2k USD to upgrade it, just don't know which direction to go.

I use the PC as a workstation for game development, 3D rendering, etc, not fully focused on gaming

My current spec is:

- Ryzen 5 3600x
- RX 590
- B450
- 2x8GB RAM

Do I buy a 5900XT and stay on AM4? Which MOBO will I need to run this CPU on? I don't think my current B450 can handle it, but at the same time, if I have to buy a new MOBO, why don't go for AM5? but which mobo+cpu combo is the best for this price range? for GPU I think I'll just grab a 4060