I gave up waiting, and bought a new PC desktop a couple of months ago, with an i7 6770k, and a GTX980Ti (about three weeks before the 1080 was revealed...).
I'm still tempted by a new Air; I still remember the awe my 2011 11" provoked - it was so thin! So light! So expensive! Such an awful screen! It made a good Christmas present for my sister a couple of years ago though.
The retina Macbook is beautiful, but too expensive, too compromised, and honestly, I don't really need a laptop. Not because iPads are the new PCs, but because my work Lenovo T440 is good enough for work stuff, and when I sometimes need a portable PC which isn't locked down, my HP Stream 11" is surprisingly good - it's the first PC I've ever had which actually IS the sum of its parts (most are bottlenecked in one place or another, this one, although low specced, is so well balanced that it can actually use the full potential of all of its parts). The screen is very similar to the 11" Air, but it was a tenth of the price.