Anyway. I got a bonus in work so I have money burning a hole in my pocket, although I could put it towards my house savings, but I'm getting tired of saving.
The spec currently looks like:
Ryzen7 2700X, 2x8Gb 3666Mhz DDR4, Asus Crosshair VII X470 Mobo, NVidia 1070Ti, Samsung Polaris 256Gb M.2 drive, Corsair 750W PSU, Be Quiet or Crystal Design case.
Normally I wait until I can get at least double performance across the board, but this would give me 50-60% increase in most areas.
The alternative would be building a NAS for myself, aiming to run OpenNAS or FreeNAS, but it's tricky picking a cheap, small, silent, low power setup with enough oomph for running a media server but low enough power consumption when idle to leave on 24/7.
Of course if I upgrade the gaming rig, I can put a rubbish video card into the old one, turn everything down and use it as a NAS, at least temporarily, though I doubt I'll get the power consumption below 50W.