I can understand
buying the air as a stop-gap, and rolling the dice that they'll actually put out a real pro next time (how long do you think the wait will be this time?)
However, I'm slightly bemused why you didn't just jump ship now.
By jumping ship, I most certainly don't mean picking up an MS thingie (that's nearly as locked down as what you're running away from).
I read the article as a paean to an age where you could buy something well built and then upgrade it incrementally as your needs increased.
Bluntly - why not just buy a nice laptop, with a nice CPU, a nice screen and sockets you can clip upgraded memory and storage into? It's what you had before and clearly what you want.