Looking at upgrading or replacing desktop (Linux photography)

I'm thinking about upgrading my current desktop. I don't really *need* to upgrade as it is still pretty good, but some of the software I use is definitely lagging a bit in certain processes. I switched to Linux full time a few weeks ago, and some of the slowdowns have gone away but the sheer processing is slower than I'd like.

I'm considering upgrading my current system, or just buying a new prebuilt. I really would love to build a new Ryzen, either a 3700X or 3900X, but it still seems to have some teething issues--particularly with Linux. I would love to return to AMD, and the sheer horsepower is pretty impressive.

For a prebuilt, I've considered something like an Optiplex SFF. I'm mostly concerned about the noise, but also whether that's a good buy. For a little over a grand, I could get a ready-to-go Linux Optiplex with a i7-9700 or i9-9900. I've *always* built my own desktops, but so many parts now just seem to be gaming oriented and RGB bling. Impressive, but not something I worry about too much--and a lot of these boards have a lot of extra stuff.

If I built or upgraded, I'd either keep my case as I like it quite a bit, or maybe I'd consider something like the Node 202, or something else mini itx. I mostly need CPU horsepower, maybe a couple drives, and a light video card.

I also feel like I should keep a Windows desktop around, for the rare time I might want to fire up a game, so I'm not sure if I'd keep my current desktop, or build a gaming HTPC, or something. Maybe just a Windows laptop... I'm not really sure. The last game I played was FarCry 5, and enjoyed it, but since then I've only played a few hours of Day of Defeat. I think it's mostly the idea of not having a game-capable machine that's messing with my head more than anything.

Which would be the best way to go?

Current system:
i7-4790k
24Gb DDR3 RAM (mixed G Skill sets)
Asus Z97 ATX motherboard
XFX R9 390
Corsair 650 power supply (non-modular, probably 7-8 years old)
Corsair 400Q case
Samsung Evo 860 (I think) SSD

Current software:
Mostly I use this for photo editing and general productivity. I'm working through the FOSS switch, but generally use darktable, GIMP, Geeqie, rawtherapee (sometimes), and Rapid Photo Downloader. I think these are all multi-threaded but not sure how much or how many filters are. I am running OpenSuSE.

I generally have a bunch of other stuff open, terminals, browser windows, and I'm usually listening to music or watching YouTube/Netflix while I'm working. I still have some bugs to work out but it's going.

If you are open to buildiing your own rig a 3700/3900x system sounds like it would do you alot of good. Btw theres no reason why you wouldnt be able to crush any game with a 3900x or 3700x. If you reuse some of your current gear you should have no problem staying below a grand.

I am definitely open to building my own. My only holdup with AMD are the potential quirks, but I would prefer to use AMD for a while. I could probably get away with just buying a board, CPU and RAM and keep the rest (at least for now). My power supply is getting old and my video card only has a single display port--which is only frustrating because my monitors respond instantly to display port and take several seconds to respond to HDMI.

Can you recommend a motherboard for it? I would *like* to have optical out on my audio, Intel NIC, and enough USB ports. M.2 would be nice (my Z97 has it). My case is ATX so I'd probably go that route but I'm not super picky. I just want something that is reliable, and plays well with Linux.

Ugh sorry man i lost track of the thread. From what ive been seeing the gigabyte boards are really solid but there are a ton of solid mbs to choose from. I would go with the brand you trust the most and dig through some reviews from good sites. Sorry i cant be more precise but its honestly harder to pick a bad 570mb than find a good one!

No worries, I have been pretty busy! I have probably the most experience with Gigabyte and Asus, and I found a couple X570 boards that have everything I want, and a few things I don't for about $200. The Asus is a little more expensive. A few more bells and whistles that I need, but I have a few wants that looks like I have to spend a little more. Probably not a big deal over 5 years to spend an extra $50 now. Thanks for your help!