I try to stray away from telling anyone what they should do. I realize that this is an opinion piece but it still is basically telling you what to do.
I think most people who are smart enough to watch WWDC are also smart enough to make up their own minds about when to buy a new Mac.