I've been through similar struggles and I think you're absolutely right to pursue the correct dx. Get to a psychiatrist as fast as you can. It's CRUCIAL to get the right dx.
I had the music thing forever too. Not anymore since going on seroquel. Good luck!