I think you handled it with quiet dignity and grace.
I would not have offered the advice out of nowhere, but like you, would have mentioned the kilt pin when the conversation turned to kilt wearing.
Good job referring him to this site also.