TBI/PTSD,
If you have been "super manic" even just once, you are BP1. The only other possibility, if there are peculiarities to your case, would be BP NOS. Your formal dx may be something different if a pdoc did not witness the mania, but technically, you couldn't be BP2 if you've been manic. BP2's, by definition, only ever get hypo. Major depression can be present in all types of bipolar - BP1 is no exception. Some BP1's don't have depression, but many do - and bad.
You are right though, that it is much more important to know that you are on the bipolar spectrum, so you can receive treatments that work for you as a person and your symptoms, such as they are. The formal dx is not so important.
---------
It was great to get an update on Trip. I was not sure if it was you... I remember the CostCo incident now... and some other things.

I guess that is a pic of Trip on your profile page. What a cutie. Glad he healing up well - he is lucky to have you taking care of him.
Keep taking good care of the both of you, as you have been. I hope the new treatment plan helps you a lot.
waves