Sounds like there was one person on the floor conducting themselves in a professional manner...shame your partner didn't take that approach.
As for the shirt issue, our chapter instructor told us to send them back the first time, that usually forces the coach to handle the situation. I usually just tell them to tuck it in and hold things until they are ready.
As someone else has already pointed out, you learned something and are learning more on the issue by bringing it here, overall a positive experience
I've had a partner similar and pretty much handled it the way you did, and moved figuring you take the good with the bad. Grin and bear it...or as my wife would say; "Kill them with kindness".
Or read my signature line and resign yourself to the fact that your partner is on that list of people
