Ha, funnily, I just posted my own story of a harassing driver, although mine was MUCH less of a threat than yours. Although, once we started arguing, he did say to me, in a threatening way, "You're lucky I didn't hit you."
Anyway, I agree it sounds like you handled it well.