Comparable thinkpad or lenovo to Dell XPS 15 9560 (specs, not comparable problems)

My XPS 15 9560 has a 4K UHD IPS display, i7-7700u 32GB RAM, gtx 1050, and a 1tb m2.

Its a piece of shit that overheats and throttles.

I like the old T series style, squared edges. I don't even think i would use it for gaming. I really enjoyed the old keyboards instead of the square chiclet.

4 lanes of TB3 so i could use an egpu if needed.

I really hate the aspect ratio of my x240 as well.

Touchscreen would be a must because i need to edit blueprint pdfs often.

What should I get?