I’m at the point where I still greatly prefer MacOS, but Windows hardware.

Unless things have changed dramatically, my 2017 MBP will be my last when it’s time for a replacement. Hundreds of dollars in add-ons to make it functional and a terrible keyboard are too much to live with.