You done good. She was not a threat (at least once you avoided her car), so you did right by not escalating the situation. Let blow hards blow and walk away when you can.
If she approached me aggressively on foot I would walk into the mall. She simply isn't a real threat.
Do not go from CC to OC without a serious physical threat from the BG - that's brandishing.
It sounds like both you and your gf are well versed in the need to keep cool while carrying. Well done.