My old MBP is dying so I'm in the market for a new one and I'm trying to decide between the new MB Air and the 2017 non-touchbar MBP. I read that Apple had a replacement program for the 2017 keyboards, but did they do anything to address the issues with ones they're currently selling? The 2018s all have Touchbars and I can't justify their cost, so those aren't a choice although I know they have the newer keyboard style that is supposed to block out dust and dirt.