Jung is an INxJ if I ever saw one. I've been studying him for my thesis and it's Ni all the way. In his life, in his theories...the man did his PhD. dissertation on the supernatural, on how his niece functioned as a medium...he was convinced there was meaning in the dreams he had as a toddler. He's constantly torn between his desire to be scientific and the realisation that what he does is in essence not. He is not a logical being to the core the way INTPs are at all. His disregard for scientific logic has got him relegated to the furthest reaches of credibility these days. He's branded a mystic rather than a scientist.
I recognise a lot of my own thought processes in his and I cannot see a "normal" INFJ in him for the life of me...he's too overtly selfish for it, too self-absorbed, so my guess would be INTJ.