Reading your post, I am definitely concerned. I agree with all the wisdom shared above.
These disorders can be quite tricky to sort diagnostically. For that reason, my advice is to try to see the best possible psychiatrist Dn candidly share all relevant observations openly. Then, see where you guys are.
Many of us received inaccurate initial diagnoses, sucha as major depressive disorder. Be patient. Do your level best. We are here for you.