In an ADHD clinic chances are considerable that you get diagnosed ADHD or not at all (which they don't really like much, generally). So it could be ADHD and/or BP still.

The correct label is very important if psychiatrists know much about them. Regrettably, not all that many know about many labels and the nuances, as in experience with patients and knowledge of the syndromes. So you might want to try and find such a psychiatrist, treating many different labels, eh.., people.

APAB.