I went with a Lenovo Thinkpad X1 Yoga. It hasn't arrived yet, so I can't directly compare, but I've tried the keyboard & trackpad in store & they feel about as good as my mid-2012 MacBook Pro. I chose the premium screen upgrade to HDR Dolby Digital 500 nits, 8th-Gen Core i7, 16GB RAM, 512GB SSD, touchscreen/pen & 3yr Next Day On-site Warranty was $1500 cheaper than a MacBook Pro with the same specs. The Thinkpad X1 has a user replaceable SSD, so I'll upgrade it to 2TB for $1000 cheaper than Apple's SSD upgrades, which are soldered on. I also love the Black, which fits in with my 2006 & 2007 Black MacBooks.
I considered the Surface Book 2, which has an excellent keyboard & trackpad, but the SSD can't be replaced by the user & tops out at 1TB. I was worried about the Surface Book hinge being fragile in my backpack while travelling & commuting.
My 2006, 2007 and even my 2000 Pismo G3 Macs all still work well. I used to love Apple reliability & recommended the Apple Store to everyone, I was that guy who queued for a day-one iPhone 4. But my mid-2012 MacBook Pro (bought in 2015) has been a lemon, the data flex cable keeps failing every few months, causing it to corrupt data & eventually lose the boot drive. (SuperDuper! has been a lifesaver.) Apple have replaced the cable 5 times now, each time with a week of downtime, but the replacement cables all have the same known defect & I just can't trust the machine anymore.