Truth hurts. You have to tell him and highlight the boundaries. Explain to him how you feel comfortable around na mehrams and yes, he is also included in this category.
If it makes you feel uncomfortable, why suffer in silence?
yea if you think you have confidence to share this all here and abilities to think you should be brave and tell him straight up just you are using so much f f same language. or nicely or what ever is best.