The waiters actions were completely unacceptable. I don't think you were overreacting at all. In hindsight I probably would have said something to the Head Waiter or at least told the waiter that I thought his "little joke" was not proper for young people.