Er, the option to install your own keys could go away too as easily, right?
That depends on how that option is deployed and how it interacts with the hardware. It is at least possible to deploy a key-based option that Apple could not arbitrarily rescind. It's not possible to do that with a check box in a control panel.
Maybe. What happens when the check box goes away on a future version of MacOS? If my freedom depends entirely on an obscure checkbox rather than the ability to install my own keys, that seems like a thin reed to me.