I'm sorry you are going through this. Them getting a DX wrong is far more common than getting it right. Try to focus on the areas you wish to improve and not the label. The label could change again, but at least you will still be moving forward and getting some help. And don't stick with a doctor out of loyalty. If they suck, or you don't feel they are helping, do yourself a favor and get a better one. (((Hugs)))
I spent a few months with demons, they didn't touch me thank goodness, but I know the fear these manifestations can cause. I hope you will keep us posted.