Could it be made so that every civ starts with one of 3 civics in cultural section, but that you still need to discover techs to choose other 2? So I start with nationhood, but can't swithch to nationalism until I discover Mysticism? Don't put +1 happy per unit to military state. It has enough features already: Draft, Faster unit building, free unit upkeep, less culture. Other labor civics are not so well developed and distinct. And, +1 per unit fits into some dictatorship, while military state isn't necesaryly represive.