You just described the XPS 15 9560... Except the Dell gets a mostly proper keyboard with real function keys (this matters greatly to me as a programmer). It's not ThinkPad grade, yet close. (I've tested my colleague's top spec model).

As for Apple, it's a shame they don't ship 32gb laptops with touch screens.

I'm currently on an ageing OG X1 Carbon (i7/8/256), which has a sensational keyboard and track pointer, with a superb light and strong chassis; for my next, I'm hoping they'll upgrade the core count to 4+ and memory to 32, and an AMOLED display.