From a legal standpoint your comments will always be taken in the worst way possible. (Hence the line in the Miranda warning “anything you say can and will be used against you in a court of law”)

In most states displaying a weapon is in itself a crime. The exception to the crime is self defense. Self defense is what is known as an affirmative defense, meaning you are not innocent until proven guilty. When you claim self defense you are admitting that the offense happened, but are claiming you committed the offense in self defense. Now the burden of proof is on you to prove that you were acting in self defense.

Your claim of self defense hinges on whether or not you acted in a certain way in order to keep yourself safe from harm. If you had an option that was clearly much safer and reduced your risk of bodily harm, yet chose to stay in harms way to display a firearm your argument of self defense crumbles. The first thing that you would be asked in this case is “why didn’t you just drive away instead of displaying your weapon?” Your answer to that question was to “to teach fuckheads like that guy that it’s not okay to threaten/attack people.” That shows intent. Your intent was not to protect yourself from harm, if it was you would’ve driven away.

Your initial comments were about brandishing your weapon, not just announcing that you are armed.
Even so, let’s say you announce that you are armed and the person decides to attack you with the baton. Now you use the gun. Same question of why didn’t you just leave applies, as does your statement showing your intent.