It's starting to look like I might need a Mac laptop. The good news is I can wait until WWDC. The bad news is I don't think we'll get new keyboards... Eep.
@rosemaryorchard FWIW, I have a late 2016 MBP w/TB, which I've had since Dec/2016, and I haven't had any problems with the keyboard yet at all. (Knock on wood!) I don't doubt those who have, but I figure it is worth noting that there are different experiences that the narrative.