I would like to suggest an alternative, namely the radical reduction in the scope of what questions are resolved politically, as opposed to voluntarily.
One of the geniuses of the American founding fathers was to exclude religion from the set of questions to which the answer is determined by the political process. Not only did that radically reduce religious strife, it greatly aided in making America unique in the developed world in the degree to which religion (freed from the shackles, even golden shackles, of political intervention) prospers.
Why don't we do the same for economics? Product Safety? Labour practices? Education? Health Care?
Let's get government out of each of those arenas, and do away with the very prospect of having others dictate their preferences on you.
Government is not the solution. Government is the problem.