Yeah, this is what i see based on my knowledge...that and i identify similarly in terms of I/E so maybe i've picked up on that? hmm
my partner is a pretty strong INTJ, while my best friend is an EXTREME ENTJ. based on how i've seen you post/debate i was really inclined to go with ENTJ because it reminds me of how my best friend and i interact in terms of debate and discussion..but being able to relate with SS in a lot of ways in terms of your guys' relationship interactions would make me agree with your own assessment.
that and it's like, your own assessment

I liketh this post.
Even though I score around 50/50 on my I/E divide, I most definitely am an ENFP.
Zara, in my opinion, aside and beyond MBTI is most definitely an introvert, not a hardcore introvert, but an introvert nonetheless.
But, he's WAAAAY more extroverted than most guys I really dig, hahahaha, I like me some introverted men, yo.
Anyhoo, I think XNTJ, is a good description.
Why I love him, his Ni and his Fi, or his F- warmth,
But, he gets into an ETJ mode that makes me go :horor: and

and :steam:
I do not mind AT ALL ETJs who are healthy, they're confident, assertive and get shit done.
But I think Zara slips into ETJ mode when he's stressed out and that, in my opinion, is when he is not in top form, so he tends to unleash a Te MonsTErrrrr!!!
it's berrry scarrry.
