I bought my first apple product (an iphone 5) a few years back, and have been slowly buying more and more into their ecosystem, which sounds like the opposite of what you did. I come from old ThinkPad laptops; I've been using thinkpads with the trackpoint for two decades now, and with lenovo now changing the keyboard, I bought a macbook maybe a year ago.
Interestingly, I got the iphone 5 because servicing anything else(beyond swapping batteries) was really difficult due to a lack of parts and information. the iphone is actually far more repairable than other cellphones.
> I wish Mac Pro range focused more on upgradeability, at least on desktop models, and less on thinness.
Right now? I think the mac pro desktop is mostly dead. Apple claims they will build another, but... we will see. The specs on the current mac pro are thoroughly obsolete.
I do agree that if you want me to buy an expensive desktop, you put it in a case and you let me upgrade it. I mean, I have a mac mini, too... but that is a lot cheaper, so I'll take some compromises.
Laptops, on the other hand? I understand there is a tradeoff between thinness, reliability, and upgradability. Every socketed part takes up more space, and a socketed joint is less reliable than a soldered joint.
That said, I think that the 'all usb-C' jump was a bad choice, and even if you agree with that vision, it was too soon; even today, I can't find a usb-C to wired ethernet adapter.
I also think the keyboards might be a mistake. I bought a macbook about a year ago, with the short throw keys. They were interesting and crisp, and generally okay in an interesting sort of way... but over time, they've been getting clogged up, and unlike a laptop I can take apart (I usually roll with older ThinkPads) I don't see any way to clean out this keyboard.
I guess the whole idea behind a mac product is that you bring it in to be serviced, and I did buy the extended warranty, so perhaps I just need to take the thing into the service center.