Definitely wait and see. Always the best choice if you can do it. You may also want to do as I am, get a new one now while they're on sale and then flip it for a small loss next June or whenever the entire line is reset with the new design and we have enough time to see just how reliable the new KB, etc are. It's also entirely possible that this last batch of machines with iteration 4 (or 4.5?) of the butterfly keyboard will be a better laptop than whatever Apple hits us with in the upcoming 3-9 months, and worth keeping for a few years to come. I've learned to be very wary of anything new Apple trots out, particularly first gen. Maybe we'll get a better keyboard, but will it come with an across the board price hike in year one? Probably. But will Apple up base configs on the MBP to 8/256 or even 16/256 to make those price hikes easier to stomach? Mmm, that does seem possible, if a little unlikely.