Intergalactic Civil War !!??

[Nitram Draw]

Please excuse me if this has been suggested before but this thread is getting real long and I'm getting lazy in my old age.
Perhaps there should be an intermediate step before civil war, a period of civil disorder. If the conditions for civil war are met then all of a specific systems planets begin to riot. If after a random period of time, say sometime between 1 and 2 years, the rioting isn't stopped then the system rebels. If this could be implemented then at least you would have some warning of a rebellion.
If possible all positive happiness modifiers should be negated during the civil disobedience time except those caused by troops and ships.