I'll likely go with the simpler annexation rules for now...

RE:Civil Wars, I kind of like being able to hold ground (like a bridge) or settlements but hated the War or Words. While I don't think things would be quite as bad here (the Basileus in Const versus and Egyptian House with neutral houses in between did not make for an easy war) I can still see why people have concerns.

Something like the system for the war in the last game could work, or just a "gather armies for one big battle". Alternatively, we could just punish people who stall. X turns with no hostile moves means an instant white peace with all captured settlements going to whoever is currently holding them.