I think it is better to let them figure it out. I was treated for depression early on. Opps I forgot to mention I heard a voice (God) and periodically thought I was the second coming of Jesus. They didn't ask and I was not sure what to say and really didn't want a label.
The problem is my life got worse instead of better and ended up hospitalized. If I would have been honest then I might have gotten better treatment to start with. Either way I am happy with my life because the right meds have given me the ability to cope. Psychosis was my escape and now most of the time I don't want it. Don't get me wrong I have my moments. But they are far more fewer and further between. For the first time in my life my thoughts, wants and desires are consistant and don't change with the wind.