I think all of this is fine. I think putting a lock on the MBR might be going overboard. Just make it clear to her that she's no longer welcome in the MBR and she can sleep in another room. Calm and collected.
I think that being done mentally is a good place to be and just move on and do what you want. I think if you're taking this approach, take a look at TxHubby's sitch. He did the steamroll DB, not giving a f$ck approach. I think this might apply to you as you're not able to kick her out of the house.
