I agree with INTP. B-A-L-A-N-C-E. Wisdom in terms of MBTI is about balancing the cards you were dealt and the cards you choose to play. Understanding the box you were born into and not let it limiting you too much.
So let me back pedal a little bit.
While all things being equal, I do think an INFJ is a better fit for me.... I'd take, in a New York minute, an INTJ who had balance in their life over a run-of-the-mill INFJ if he
- knew how to compensate for his weaknesses, and
- understood how to leverage his strengths.
INTJs and INFJs are both rare. But finding a self-actualized person (regardless of type) is rarest of all.