I think the morality based approach is not going to work for the majority of society, as it didn't in the past. Instead, we should take an analytic approach and focus on maximizing integration (freedom to act) and differentiation (freedom to think).
Integration is the idea that we should all have the ability to leave our mark on society. In other words, it means to have access.
Differentiation is the idea that we should be free to be different, that we should not fear for our physical safety. Unless people have the ability to express their creativity without restraint, we will have a society like the old Communist block, and we are headed to that with the latest mass surveillance policies, unfortunately.
An example of a differentiated and integrated society is the Open Source community. Another example is the brain, which has an astounding number of components tightly integrated yet differentiated. A third example would be the free market, where each agent tries to differentiate its offering from the competition and yet also has to be closely integrated with the other agents in order to benefit from the opportunities they create. A fourth example: the ecosystem, where each species is differentiated in order to benefit from a niche yet they also need to be integrated and function as a complex whole.
If we have differentiation and integration in society then our minds can cooperate to build a better future, organically, from the grassroots. In such a society a person would be free to be creative and have a low entry barrier to the market. If we took these two core principles and try to optimize them in society and politics, we'd maximize happiness. A differentiated-integrated system has a superior ability to adapt and find solutions to its problems.