I think Apple should make the naming uniform and get rid of the silly numbers and letters. Also time to retire the "air" moniker because it has outgrown it's usefulness.
4" iPhone
4.7" iPhone
5.5" iPhone Pro
--
7" iPad
10" iPad
13" iPad Pro
--
12" Macbook
14" Macbook
16" Macbook Pro
Between generations, the enthusiasts that care about the nitty gritty can differentiate the same way we do now with Macbooks. I.e., Early 2016, Late 2017, etc.
I seriously believe Apple is going away from naming things iPad 3, or iPhone 7 and just naming them iPhone.
It seems like it may have been quickly forgotten that Apple really has tried that in recent memory, and (fairly hilariously predictably) failed. Doesn't anyone/everyone remember "The New iPad" (
https://en.wikipedia.org/wiki/IPad_(3rd_generation) )? They were going to break away from the tyranny of sequential numbering (although everyone would just come to refer to it as, yep, iPad 3). But what was next year's going to be called? The New New iPad? Well, it was the "iPad with Retina Display" (aka iPad 4), owing to that new feature and to the fact that a differentiable name was and is genuinely necessary across product generations, both from a new product marketing standpoint and with the understanding that names functionally
have to differ in some clear way to allow for clarity in support, service, discussion, resale, whathaveyou. So what they were seemingly trying to accomplish with "The New iPad" quest to get rid of the numbers was shown to be utterly quixotic. The next year, with no new headline feature, the new product was then named "iPad Air", in a way only confusingly related to the MacBook Air product line, which was a separate, distinct line from existing MacBooks/MacBook Pros, one far lighter and more stripped down than those still-offered alternatives. (It was/is quintessentially Microsoftian in it unconsidered way, akin to the days when Microsoft would slap Windows on everything, and then Live, and why not some Windows Live, too, on nearly every unrelated product line (Windows and all its variations, Windows Explorer, Windows Azure, Windows Mobile, Windows Azure, Microsoft Live, Microsoft Office Live, Microsoft Xbox Live, Microsoft Live Messenger, Live Search, frameworks, services, mobile OSes, and on and on beyond parody).
And the year after that, iPad Air 2.

Because, you know what, sequential numbers are actually pretty handy for naming sequential products.
(And oneMadRssn, I generally agree with the wisdom and clarity of your naming scheme above, based on Apple's current and likely future lineup (and disuse for the useless-due-to-overuse of the "Air" term)... but I think experience and practicality dictates that an impulse to get rid of generation-signifying numbers is, again, quixotic. They could, of course, always use years in the name instead, like automobile manufacturers... because that worked out so well for Apple before, too:
https://en.wikipedia.org/wiki/ILife 
)