I'm glad he apologized to you. From what I'd gotten out of your original post, I found the biggest offense was how he spoke to you regarding the kilt and why you wore it. Sometimes we have to do things we don't like, but things can always be stated with more maturity and civility.

It sounds like this teacher has issues controlling the class/students... which isn't your problem, but his.