But what I want is an upgradable / self-servicable machine that costs under $3k. I would not hold my breath. If Apple are going to give you something serviceab

But what I want is an upgradable / self-servicable machine that costs under $3k. I would not hold my breath. If Apple are going to give you something serviceable and upgradable, expect whatever you would have spent servicing and upgrading (at the time of purchase) a "normal" machine through them to be added to the price.