Windows PC for work and photo editing

[n3il123]

My trusty Lenovo Thinkpad is starting to feel its age now. It is ok for most things (sql server installed, heavy spreadsheet, code development etc) however I've now installed lightroom in it and now it crawls whenever I try and edit photos (or even load the folders).

I think it is time to think about upgrading to another machine. I know nothing about processors and graphics cards and just know that more memory is good as is an ssd!

current spec is

Product number: 20J1000JUK
Processor: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
Storage: 699.6 GB
Installed RAM: 32 GB (31.9 GB usable)

I'm open to desktop or laptop.

I do only want a windows machine, I know that this may not be the best option for lightroom but I want to be able to install Visual Studio/ sql server on it if I want as well as Excel macros etc and this is what my clients use so...

Any help in advance would be much appreciated!