I will say that I don't really see either the logical marketing structure or future product development direction when I look at the current Apple lineup. Presumably that's because there is a lot of change and uncertainty in the tech market as a whole. Proving that I'm actually closer to where you seem to be at than you'd guess from my posts, part of the reason I have a new 13" rMBP is because I really am not sure I'm going to be happy with the next refresh. (The other part is because I came to the reluctant conclusion that I really would be better off with a larger SSD and, of course, recent vintage MBPs don't have readily available replacement SSDs [eBay doesn't count]).
It confusing market structure as well. I do think though that each model has its Niche. For example the Non Retina Pro apparently still sells in volumes to PC switchers and others.
My main machine is a Mid 2012 Macbook Pro Non Retina, bought September 2012, as my specific requires are for an Optical drive, a large HD on a budget, ethernet and firewire. I also like upgrading my computer myself, and have done so many times, saving myself huge amounts of money. I also like the battery status indicator and the sleep light
I think they just need to realign the names and the niches.
The Macbook should be the current 13 Inch Air
The Macbook Classic should be an upgraded (Fusion drive and haswell) Classic Macbook Pro
The Macbook Air should be the current rMacbook
The Macbook Pro should be the current Macbook Pro Retina
I am all for moving forward, but my idea of moving forward is different from others. I find the Classic Pro's form factor to be perfect and would love if they just continued to make it more powerful.
I cling onto the belief that Apple will leave the Retina Pro alone for the moment. I'd be more than happy for the Thunderbolt to be replaced with the combo USB-C and thunderbolt, as long as they leave the other port and especially the magsafe adaptor.