You got me on the MacOS X being muddled, but the majority of my complaints stem from The recently fired Scott Forstall's obsession with skuemorphic design. Now that Ive is the head of hardware and software design I am more hopeful for a return to the powerful simplicity the company is known for. We'll know when 10.9 drops!
I think you are devoted to the wrong brand if you are expecting upgradeability - that has never, ever been a priority for this company. The market is demanding thinner, lighter computers and Apple is riding high on their success selling devices to this specification. You may not like Apple's priorities and compromises, but until sales dwindle Apple is going to continue targeting the mass-market not the nerd market. When Apple stops giving people what they didn't know they wanted, and it hits their bottom line, is is when they begin embarrassing themselves (G4 Cube, anyone?).
But not until then. There is no humble pie being eaten in Cupertino.