I think OP handled the situation perfectly. When armed, first and best response to any situation is to avoid the situation. One can be deadly unarmed, but one is certainly deadly when armed with a gun.
Just fyi, car window is lot harder than most think and an elbow into it when closed will not break the window in most cases (unless done at perfect angle and strength).
Let's wait until we actually see concrete legislation before we go off half-cocked. ~ Tom Servo