Hi there from Oz or Down Under,
I know what its like to go years with a provincial or inaccurate diagnosis. I went from 95-2006 with a depression diagnosis and managed to fly under the radar and hide my hypo-mania. Working in mental health as a nurse helped me hide it I guess. It was after my marriage breakdown and a second relationship breakdown that I was hospitalized, and once a consultant spent a decent amount of time with me, getting a complete history etc., that a diagnosis of bipolar 2 with anxiety and adjustment disorders was given. As such my medication was implemented with more effectiveness.
Reading your situation made me think that perhaps you have mixed aspects that haven't been fully explored yet and that senior professional advice is always advisable. Things change and we change as human beings, so we need to be aware of as much as possible and relate as much as possible to a treating doctor, in order to get the most appropriate and effective care possible.
Best wishes on your journey from a hot and sunny South Australia