I think you need to return sovereignty to the states. There's no reason a wholly Christian or Muslim state, or and all White or all Black state, etc., should not be theoretically capable of joining the union. People can then vote with their feet.