I have the same, and the only thing i can say, is you will have to wait and see. That is what i will be doing. And why would i update unless absolutely necessary. As FSD works great.
When a new update comes out, do nothing until it is confirmed it works.
As to changing the CB, i do not know whether it is possible or not, that is something for someone like Martin C to tell you