For the Brave New World version of CCTP I'd like to see Government choice, Policies and Ideologies separate.
Government is basically your type of government and you can only have one at a time, like they are now in CCTP. Policies are like they are in vanilla CivV/GaK/BNW, you can have as many as you have Culture to buy them with, and they just represent policies you government has put in place, but perhaps have some restrictions on which policies you can have active at the same time. Ideologies would be as they are in BNW now.