Buildapc

My current pc specs are:

• Asus Prime H310M-K r2.0 (pcie 3.0 x16 max)
• I5-9400f
• Deep cool i35 cooler
• AMD Radeon Rx 580
• Kingston ddr4 1x16gb
• Corsair TX650
• Gigabyte G27Q monitor
• And two ssd's and a HDD

I have two options I have a budget of about 400 euros and I am thinking of upgrading as the PC is getting a little unresponsive in general use and gaming. Leaning towards option 1 as the cpu is almost always above 50% usage at idle as I use my PC as a server for jellyfin and some other services ,but with them off in-game the cpu is almost at 100% in tf2 and pretty much any other game and the gpu is at 70% unless in cs2 ,then if the quality is set any higher than low it is a literal slideshow.

Option 1:

• MSI Pro b650-s wifi
• AMD Ryzen 7600
• Crucial/Kingston ddr5 2x8gb

Option 2:

• Nvidia rtx 3060/3070 with broken HDMI output (both used)

Requirements:

• Motherboard Atx
• Cpu am5
• Must be available in Lithuania/EU for used parts only skelbiu.lt or eneba.lt