I say ENTP. It's very common for ENTPs to think they're borderline E/I (needing alone time to indulge an introspective bent, preferring quality conversation with one or a few people to the energy of a larger group etc.), and the following says ENTP to me:
I understand why some of the others are suggesting you reconsider T/F, but personally I'll buy ENTP. Your conflict avoidance is IMO the only strike against T in what you write, and that's not enough to detract from the overall impression which to me is consistent with ENTP (including your unfazed reaction to Edahn's insult).