I have a 2017 15" MBP and just had to have the swollen battery replaced this summer at my expense. Original keyboard had been 100% problem free, but as you know, had to be replaced with top case for replacing the battery. New keyboard is an epic fail, and after they had my MBP for two weeks to replace the battery, they say it will be another two to three weeks to replace the keyboard. Absolutely ridiculous that so much has to be touched just just replace a battery. Given the time window, I'm going to see if I can hold off having the keyboard done until early next year, hopefully turnaround time will become quicker. If not the case, then as soon as M1 16" hits the market, the keyboard can be replaced after I've moved over to a new device.