Type 2 definitely. When I was in early elementary school, definitely type 1 - I was more social with teachers and my morning/afternoon bus drivers than I was with kids my age, and meltdowns were prevalent. Now, I'm fine with about 90% of NTs. Two of my really good friends are NTs and one of them shares some of the same hobbies as I do.
However, I will have the occasional meltdown. When something isn't right and something is changed last minute I sometimes meltdown over that. Sometimes I melt down when other kids are disrupting me or not following the teacher's instructions. Just the other day I wanted to send about 6 different immature NTs to the principals office for not following the teacher's instructions. I also struggle with very harsh/mean people. Sixth grade was a living hell because of my horrible mean/harsh/crabby/stupid math teacher. The day he is retired/fired, I will do a happy dance. No offense, but he's a 63-year-old crabby butt who at this time is probably still screaming at his kids every day.