You did well not taking the bait. That's exactly what he wants.
But, the comment in front of your S about bar hopping and smoking is way out of line. You need to address that with him - not to be mentioned in front of S b/c in the end, it only hurts S.
