One would hope, but the issue will be (as it even is with the current system) in balancing the ability for it to actually reach people who need it while making sure it isn't used as "prison for those who the law can't get." While Mr. Autism here would probably happily be placed in it, the vast majority would resist (like the majority of the homeless already do with even less demanding systems) and then we are in a bind of forcing imprisonment upon innocent people. A door I want to hold closed as long as possible given The Powers That Be.

While its a lofty goal to hope for, I don't think logistically it is viable unless we can return to something resembling "polite and respectable society" where you can trust people to self-govern instead of needing everything codified down to a bullet point from the government.

And having a Psychology industry that isn't just an arm of the Democratic Party. That's a whole different tangled web that will take decades to even begin.