Excellent post and excellent awareness , anticipation and execution of your surroundings.
The only thing I would have done different was use the horn. This happens to me almost on a daily basis here in Vegas, and the exact scenario just happend to me yestereday also on the freeway. Whenever a scenario like this starts to develope, a lot of times, I have the horn covered in the anticipation and for some odd reason, I'm just begging for them to come into my lane so I can give them an ear full blast of my Stebel Horn. Yeah, sometimes they still come in but at least I let them know that they F'd up. And yes, I know I can't rely on the horn 100% to bail me out of certain situations, but I still use it a lot because it's kind of a nice revenge for most situations that I encounter.
I think I would be a nut case if it happened to me that often, glad to hear you are staying safe .