My Dell XPS 15 L501X is starting to fall to pieces after a good few years of use, can anyone spec me a suitable replacement please?

The Dell has the following specs :-

Intel i5-460M
NVIDIA GeForce GTX 420M with Intel HD graphics
8gb DDR3
128gb Samsung 830 in addition to the original 640gb 7200rpm HDD
Full HD screen
Windows 10 Pro

Ideally I'd like the replacement to have something along the following lines :-

15" FHD screen
6th gen Intel i5 or i7
8 or 16gb DDR3/4
500gb+ SSD, preferably M2 NVME
Dedicated graphics but nothing extreme as I rarely game on the laptop
Reasonable battery life
No chunkier than the Dell...

Possibly thinking along the lines of a Clevo N150RD or similar custom build, any other recommendations please?

Couple I've found so far, upgraded to 8gb RAM and a 512gb Samsung SM951 M2 SSD :-

http://www.pcspecialist.co.uk/notebooks/8142/

http://www.pcspecialist.co.uk/notebooks/7970/