Laptop recommendation - max $1500-1800

Hi there

I'm currently on a Toshiba Satellite s55 b5280.

Its from 2014, has a 12 gigs of RAM, no dedicated graphics and only 128mb designated.

It's lovely and light but it's time to upgrade.

I work full time and freelance on my lunch breaks, so I'm often working in my car under less than optimal lighting conditions or on my couch.

I use Illustrator mostly, photoshop some, and solidworks/3D modeling some too.

So, all that said, I'm looking for a 15-17 inch screen.

Best screen possible both in visibility and color accuracy.  I do a lot of design for print, product, and garments as well as web.  Light weight is preferable, considering my typical working conditions.

Requested:

SSD of some kind.

Gen 8 of i7 since it seems the step from gen 7 to 8 was significant.

15-17 inch screen

I'm assuming at least a GTX 1050 or Quadro...not sure what's best for my needs.

A USB A port along with the others.

I am not in a rush, so if I have to wait for more gen 8 stuff to come out, I'm ok with that.

Things I've looked into but have various concerns about:

Dell XPS 15

Dell xps 15 2 in 1

Lenovo Thinkpad p51

Msi gs65 stealth

Gigabite aero 15x

Hp Spectre 360

Dell precision 5520

Lenovo yoga 720 (or 730 when it arrives soon)

And I'm open to all new suggestions or comments

Thank you so much for any input