There's one more important thing: past psychosis/mania can make things worse by making you more susceptible to psychosis and by making you fear psychosis/mania/depression/instability. It can be traumatic, make you more sensitive/vigilant/wary.

So artificial psychosis due to dopaminergic or serotonergic agonists (such as methamphetamine) may cause lasting anxiety problems as well as a heightened susceptibility to psychosis.

It makes the susceptibility to psychosis less influential—relatively speaking—than if you hadn't experienced the effects of meth. So your BP would be more towards BP-II and unipolar depression.

The question that remains is whether your personality caused you to do things that have a negative impact. If not, GAD is probably a good diagnosis besides BP.

So your diagnoses might be spot on or you knowingly do things with great negative impact. You said earlier you didn't do that with relationships, so you might not have a borderline personality, but the treatment may still help you.

I believe personalities always have aspects that are beneficial and that they may reduce the severity of your underlying problem(s), which would be BP. That is another reason it might be correct to assume BP-II or unipolar depression, mood disorders being syndromes, so it's the effects that count.