I'm leaning towards an upgrade next year to the 9950x3d if reviews pan out. Sure, it's going to be a bigger machine with louder components, but the upgrade will likely be half the cost of anything close from Apple since I can take my existing GPU, PSU and storage at the very least along with me.
And "upgrade costs" is highly misleading for most of the components. You are buying a different machine config that you can't change, up or down, later on. I get that most people don't want to bother opening up a PC to swap out components, but the easier they made it, the more people will do it, and Apple is running the other way.