That all sounds wise.

However, you might immediately get help treating the symptoms: they don't have to diagnose it as BP (yet), because it would be hard to tell if it "really" is, indeed, but they can diagnose you with a substance-induced mood disorder if it is clear that your changes in mood are severe and pharmacotreatment is advised.

It could also be "just" a personality thing, made worse by using drugs. For example, borderline personality traits might've "caused" you to do drugs to simulate some BP-like instability. There might then be other problems that you "replace" by substance-induced instability. Best thing in that case would be to find better ways to deal with your problems. Possibly by having a bit more "respect" for the needs you have developed your personality for to deal with: analyse those needs and fulfil them in a more healthy, constructive way.