Uncomfortable Situation with a Friend

I don't know if there is a best way of telling him, that probably isn't going to end up without feelings being hurt. He could have social issues, like some kind of spectrum disorder, and he might not be able to help his behavior. You definitely did an awesome job helping your friend be more comfortable and feel safer (which both your friend and you deserve to be comfortable and safe with anyone you are with). All I can suggest is trying to tell him as nicely as you can, without having a lot of anger or bad attitude in your voice, and let him know that you appreciate him as a friend, but his behavior is making you feel uncomfortable/unsafe. Whatever you try to tell him, just do so 'nicely' so he doesn't feel like he's being 'criticized' or otherwise 'attacked'