I have taken the MBTI a couple times and I am consistently an INFJ. The N and F are almost always 50/50, but the I and J are pretty extreme. I once told an MBTI expert that I was an INFJ but wished I was an INTJ, which she thought was hysterically funny, and to this day (20 years later), I still wonder why.
I completely buy Sherlock as an INTP, but then again, I only know him from three places--the books, Jeremy Brett (the quintessential Holmes, for me), and Cumberbatch. I haven't seen a Rathbone movie since childhood, and I've never seen Elementary, and the one Guy Ritchie Sherlock movie I saw was so long ago I couldn't tell you a thing about it. Except it took place in London...I think.