Kelly, you have gone way beyond what many GG's would do. I don't understand why he had to change into male clothes to argue with you. So you should be upset at this.
It sounds like you have gone way out of your to be supportive and helpful. Many CDer's would die to be in his place. It also sounds like he still has some insecurities about dressing..since he felt the need to change