ISTJ or INFP?

Looking at cognitive functions, I deduced Fi, Te, Ne, Si (not in that order) and taking tests specifically for cognitive functions i get ISTJ. However, looking at generalized descriptions for both ISTJ and INFP rather than dominant Si/Fi, I find that I resonate with both (and when taking MBTI tests ive usually gotten INTP/INFP). If this helps, I've done more research into enneagrams and find that a 4w5 describes me almost perfectly (heavy on the 5 there).

• as a kid, i was known as a "crybaby" and found sentimental value in all my stuffed animals, etc
• im very resistant to change/i tend to become fixated on the past
• its always been very hard for me to connect to people
• when presented with a conflict, i try to look at all perspectives to deduce who was "right" or "wrong"
• i have a very strong sense of justice, and sometimes have an issue with seeing things in black and white...
• if i care about you, i care about what you think of me
  • but if i dont know you, i dont care at all
• i love organizing things into lists and have always been good at finding patterns
• ive been very creative since i was little, always drawing or painting
• it annoys me when people prioritize feelings over logic
  • i dont sugarcoat things and am somewhat blunt, and find i need to clarify what i meant by something when whoever im talking to misinterpreted what i said rather often (and doing so doesnt bother me)
• as a kid i was typically a mediator
• its very hard for me to do things that dont personally interest me
• being in charge/a leader is very stressful for me as i feel im responsible for everyone vs just myself
• ever since i was little a big thing i heard from my parents was that im extremely self aware, even to a fault
• i feel a lot, but i dont know exactly what im feeling (if that makes any sense)
• when i know ive messed up and made someone feel bad, i feel an immense amount of guilt, even if it wasnt my intention
• since i was little ive latched onto different pieces of media and obsessed over them
• ive also been told im argumentative and have strong opinions
  • although i dont argue just to argue, i only offer my input if its something i strongly disagree with
• metaphorical or spiritual debates intrigue me above anything else

I also know for a fact im an introvert, that part isn't debatable lol.

If you want any more anecdotes id be more than happy to share them, im also a late diagnosed autistic, if that means anything.