You can't go wrong with any of the thicker Thinkpads like the P series(I personally use a P50 now), but that does come with lesser portability. With the thin and light models like the X1 Carbon, there's probably some level of compromise to get the laptops that thin, but I'm sure it's still miles ahead your current Macbook's keyboard.
Other notable mentions: LG Gram, XPS (2018/2019 models)
Other notable mentions: LG Gram, XPS (2018/2019 models)