I fear for what will come at WWDC. Because... you remember the time before Steve Jobs came back and revolutionize Apple together with Johny? Before that time Apple had fragmented products all over the place for different markets. It's getting right there again. I think Apple should refocus razor sharp like it once was... if I had a say in product lineups and placement it'd be the following:
Phones
there should just be "the iPhone" with no number, it would be referred to the same as the macs, "late 2012" or "early 2015". That way people just buy "the iPhone" and always get the latest that's currently available. The update-circle is predictable so people can wait to upgrade if they prefer to.
The revised iPhones (now the S) I would call the PRO. Always. So there's the 2016 iPhone and later the 2016 PRO. The normal iPhone is the smaller 4,7 inch form factor with a friendly entrance fee and friggin 32 GB memory to begin with. No Phablet Plus (I'll come to that later). Colours should be: silver, white, space grey, gold, rose gold and maybe for the heck of it galaxy blue or something. In the larger PRO variants I'd offer DUAL SIM support for pro-business users. Charge them big time for more internal memory or an extra-extra premium for an micro SD slot for further memory expansion. If they want to do something fancy with an iPhone once in a while (maybe underwater iPhone or whatever) call it "iPhone SE".
Tablets
there should be just the "iPad" and the "iPad Pro", same naming conventions and colours like the iPhones. They are both the same size. Difference is that the iPad Pro in addition to being more powerful and probably having more accessoires like the pencil and keyboard also feature one thunderbolt/usb-c connector for "pro" accessoires AND the ability to upgrade your memory via micro SD AND use not one, but two sims in there (for calls/data or for business/private) thus eliminating the ugly "phablet" form factor. If Apple wants to do something fancy here and there with their tablet, call it "iPad SE".
portable Macs
Here as well I'd have just the normal one's, PRO one's and if I want something fancy (like what I would categorize the current rMB in) call it SE. Have all the same colours again. Have a nice entrylevel (below 1000 bucks) macbook offering. Make it 13" only, no dGPU, give it options to upgrade and a good amount of ports, could maybe have a similar formfactor to the current 13" air. Then have the PRO machines, 13" and 15" (maybe even 17") similar to current rMBP with all the ports you could need and NO intention of going thinner just for the sake of it, rather use free'd up space by smaller components for more battery or stronger components. Offer WITH and WITHOUT dGPU depending on use case, all PRO machines features thunderbolt and eGPU support. No sacrfice of power for thinness.
Macs
iMacs: same naming conventions, same colours. Let's have 21" (or what the current form factor is) and 24" iMac as the consumer-grade standalone all in one desktop. Give it fair amount of ports, dGPU option in the bigger model as well as eGPU support, price the smaller model as entry level-friendly as possible. User-upgradeable RAM at least.
Mac mini: same form factor and bring back the glory of old days, quad core CPU, user-upgradeable, nice selection of ports, 3 variants, starting with a 400,- dualcore version for entry level buyers.
Mac pro: ditch the trashcan, go back to modular design with upgrade options and give users the ability to use "mac certified" hardware off the shelf. Be a player in the PRO field again. Use multidice server architecture for wild rendering and cpu performance, dGPUs for different setups (technical drawing VS rendering VS movie editing etc...) ALSO have additional eGPU support.
Thoughts?