I really, really want to upgrade my 2015, and really don't want to switch to a non-mac. Apple is not getting a cent until they fix the hardware.
Other laptops now match or better the display, and many have better keyboards, though all laptop keyboards suck compared to mechanical (buckling spring, or cherry mx browns) imho. TBH though, I mostly use a deskop, or my work laptop on a dock. I see no upside and a lot of downside to current Apple hardware though.