Where has this thread been hiding? (Ahhhh.... I see it was just moved to the NF Forum due to topic "derailment".)
Answer to the OP: Before I dive in and read this thread (which interests me greatly) I have to give my answer to the OP's question: ENFP. Hands down. Not even close. ENFP is totally perfect for INTJs. INFPs are, in general, a terrible idea as an INTJ mate.
OK. Now I'll go back and read the rest of this thread before posting a more complete answer.