While societal changes can help, there is plenty that environment can’t fix.
A set of conditions becomes a disorder when they have a significant negative impact on a person. It’s the difference between "oh I’m so OCD giggle"and “if I don’t flip the light switch exactly four times, someone will die”. Even under perfect conditions, there are still negative impacts.
Declassifying it only hurts patients as then insurance and society at large world be given no reason to cut a little slack (for lack of a faster description).