What CPU and Memory Combo do you all use as need to upgrade very soon

Hi,
Just Wondering what Pc Specs do you all use ( I no there are Mac users as well but I'm a Pc User).
Currently using a I5 with 16gig Memory but the system is breaking down with sudden reboots (over 5 years old), so thinking either a I7 with 16gig mem(start with) or a I9 with either 16 or 32 gig mem.
Probably use a 2070 or a 2080 Graphics card with either 500gig ssd or 1 TB ssd for Applications with a sata 2TB drive as well.
I dont no if I would see a vast improvement from a I7 to I9 for Photoshop/Lightroom work as the graphics card would probably take up the processing along with a quick ssd.

Thanks in advance for your replies