neither. the kind of society you posit is the same kind of society that utopianists have been working on for ages. i don't want to fit into some design. i don't want what someone else thinks is dignified, or healthy, or comfortable, or safe, or diverse. i want to figure out my own shit, and be around other people who are also figuring stuff out, so that i can learn from them, and that will never be safe, rarely be dignified or comfortable, etc.
people use these words (as well as respect, honor, trust, etc) like they mean something. in practice, all they usually mean is that someone else is in control.