It's little things like this that have been showing people like me, who many, many people depend on for their tech recommendations, and who bought into the Apple thing because they were supposed to be so much better than evil Microsoft, that Apple is now only just incredibly better at lying, also known known as Marketing. I keep what I have now, it all works fine, but Apple gets no more money from me. And by word of mouth, their reputation is going to hell.
First of all, I commend you for putting your money where your mouth is. More than anything said on an internet forum, voting with your wallet is the best way to tell companies how you feel.
Regarding the marketing thing, when has Apple actually lied as opposed to simply not living up to the expectation that you have placed on them given your interpretation of their marketing campaigns? Most Apple ads as of late don't even have many words, they just show people enjoying their products.
For example, if you interpret "It just works" to mean that every Apple product ever made will always work perfectly, then of course Apple lied. But no sane person would interpret that statement in such away. For that matter, nobody should ever make decisions based on marketing alone. I have never purchased an Apple product without seeing it in person and using it first. Separating marketing from reality is a basic skill that all able-minded people should possess, and no company should be held accountable for someone's lack of that skill- unless the company flat out lies. Again, I don't think that Apple has flat out lied in a very long time.
(To be clear, I am not trying to insinuate that you lack the ability to separate marketing from reality. I've seen your posts around here many times and know that you are intelligent. But I certainly know that a large segment of the public lacks the ability to do so, and it's quite alarming.)
Furthermore, Microsoft was indeed evil in comparison to Apple- ten to fifteen years ago. Today's Microsoft is a much more pleasant and nimble corporation that works with the market rather than against it. I sure hope people aren't stuck in the late 90's mentality that drove a wedge in between Mac and Windows users.
TL;DR- Take all marketing with a grain of salt, buy the product that works for you- Apple or otherwise.