Hmmm, I see pluses and minuses staying with this T and ultimately, you'll have to make that decision for yourself. Like other's have stated, it is not your job to show him the errors of his ways. Maybe it is time to be frank with him about it seems pretty clear that you guys are not matching up here, and does he have a supervisor he could take this to, preferably a female supervisor, to get another perspective as to why it is upsetting you (and inappropriate for him to have said what he said, just not sure if I'd say this part).