I agree that you should get more of a definitive diagnosis. If you go to a new psychiatrist, you might want to press him/her on the past (or even their) casual speculations about any diagnosis. I do think that all of the speculations could be right, but right for you, I couldn't know. Anxiety, dissociation, bipolar disorder, and other conditions can include scenarios you mentioned. So can what is now referred to as Maladaptive Daydreaming. The latter can put a person into a state that can seem (but is not) psychosis. Such intensive daydreaming has its own causes and can bring great dysfunction. One can become elated, terrorized, or have other deep mood/emotional experiences during Maladaptive Daydreaming. It's amazing what the brain can concoct, even in brains of people who seemingly don't have a diagnosis. Just think how many people in the world are 100% they saw a UFO, heard their deceased mother's voice, felt a sudden chill travel up and down bones, see flashes of brilliant light or unexpected images that didn't exist, experience mild deja vu, or similar, think they smell lilacs, when there aren't any to be found. They all need not always be psychosis.
Please note that I am not offering a diagnosis. Just sharing possible things to consider.
An interesting discussion on maladaptive daydreaming and bipolar disorder at:
Is maladaptive daydreaming occurring concurrently with bipolar disorder a defence mechanism or one of the symptoms of hypomania? - Quora