You're not wrong. You are genuine. I wonder though in what ways is the anger and pain serving you? If it is fueling your growth where you're able to move through life like you want, then awesome. You're all set. However, if it feels like an anchor and it keeps you returning over and over to the same types of experiences with the same feels maybe its time to fully believe in your gut instinct that you're not wrong, say to heck with the cruddy advice you were given and navigate into something that brings you more of the emotions you prefer to experience. If you find a particular form of treatment invaluable and negative, seek out an alternative that better suits your needs. One size fits all never fit everyone.
Maybe those people who treated you poorly will grow. Maybe they won't. You cannot control. You can only influence and you have to decide if that is how you want to spend your energy? You know what these people feel like. You are also growing a good sense of who you can open your cave to a d find love and acceptance. You can choose. You don't owe any one your time or energy. It is a choice whether we have a diagnosis or not.
I'm not a diagnostic expert, so I'll let someone with better knowledge speak to the difference between the conditions you've mentioned. I do though agree they are boxes. The world we live in is full of much more interesting shapes. Try not to get lost in the geometry someone else paints for you. It is worth consideration and in many cases should be taken quite seriously, but it is just a sliver of your whole truth and it is only seen through a narrow lens.
Much love to you Fuzzy!