You smell a lot more like ENFP to me than INFJ, but have you ever considered ENFJ? I think that ENFJs a lot of the time embody "P" attributes as a result of intaking outside expectations, subconsciously. People also tend to test as E --> I during times of stress.