I don't know the best way to deal with this situation, but fighting passive-aggressiveness with itself will not solve anything.
The fact that you waited for him shows you're not afraid of a little confrontation, but I think you may have wasted a good opportunity by getting frustrated and leaving instead of telling him directly that he was being rude and childish. People who are oblivious to others rarely pick up on polite hints.