Sounds to me like you did everything in textbook fashion.
I've heard a lot of people stating that letting an LEO know "up front" that you are licensed and carrying is "a bad thing" depending on where you live, and that knowing what is required by your issuing authority will dictate how you proceed. While I agree with that in concept, I think what you did is the ONLY thing to do regardless of issuing authority.
Sounds like you have a very savvy teenager too.
