I think so too. We were talking about MBTI a few nights ago, and he thinks that I am an INTP but with a softer side, lol. So then I tested him and when completed, I said, "oh my god. You are an INFJ! How did I not see this?!?!" I was thrown off by the way he is with others, but I realized, he is an INFJ in his heart.
He told me to stop trying to type him. LOL.