I think we are currently in a "first" for Apple in where they announced an extended warranty for their 2016+ laptops WITHOUT having viable alternative for sale. I really hope this means we get some upgrade to the keyboard. I've got a 2014 and I really want to upgrade to a 15" with dedicated graphics but if they don't fix the keyboard my "upgrade" will be to a 2015 model. There were some reports that Apple is using a new alloy when they replace in those stupid butterfly switches them that has less issues but it hasn't been confirmed AFAIK.