Diplomacy AI is supposed to be improved. I believe it. Warmonger penalty, which was already reduced in a patch last year, is going to be reduced again. This is probably necessary, since the new culture mechanics will provide less incentive to war in the first place.
As for military... asking the AI to move units to the right spots really is too much. I would appreciate it if the AI just assumes troops controlled by human players are worth more value when deciding war/peace/diplomacy. Something like 10% on King, 25% on Emperor, 40% on Immortal and 60% on Deity. The whole point of the AI having more +60% more units is that the game admits a human player's military tactics will be +60% more effective (irl it's more like +600%) than the AI. But, the diplomacy logic hasn't followed that, so it makes AI diplomacy ignore what the game developers themselves (in the very act of setting up Immortal/Deity AI bonuses) have determined to be a good balance.
Just this one simple change will add a LOT more depth to the AI. I want to be forced to outperform Deity-level strategy when I goad someone into attacking me, not only to just outperform Prince-level strategy. It's one simple constant to variable change in the code. Make it happen devs.