[guard-of-terra]

As for the riots: I'm not sure that your society is fixable, whatever you do. Maybe it is but it's not given.

[guard-of-terra]

"It was still wrong for me to kick her."

No it wasn't. You should fight back. Diplomacy only works in two cases: a) everyone is calm already, b) you've proven that you are devoted to kicking the shit of anyone you have conflict with.