Your situation differs a little. The difference is he put his hands on you. I would respond the same way you did if someone put their hands on me.
But in a situation where there is no physical contact, it is very unwise to escalate the matter while armed.
One never knows when things will escalate or what others will do. I was taught to get the element of suprize on the agressor and the person approaching is the agressor.
On a side note, I read this morning about a local man that shot another man because the man playfully swatted the shooter's grandmother with a flyswatter in the trobossas. The shooter is now in jail and the victim is in ICU. Never know when an armed person will snap and never know when a person is armed.