Create more state controls and county autonomy. That way, a heavily liberal city isn't deciding on the laws of rural, conservative areas. Also remove church from state.
When I hear "state controls", I tend to think it will in practice be implemented by means of another govt institution with its own additional corruption. Maybe you had other plans :)