I‘ve switched to a T480s Thinkpad. Best keyboard I ever had, OK touchpad, good matte HiDPI screen, USB-A, USB-C, HDMI, Ethernet, 1TB SSD, 24GB Ram, much nicer case than Macbooks even, price 2300 USD. Only downside: Hinge doesn‘t open with one hand and ... it has no MacOS. Takes a while to be as productive on Win or Linux but the hardware is absolutely worth it when compared to the mess that is the new MBPs.