No solution for Diplomacy unfortunately. There is a rule of thumb we follow - change it only if it feels nice. in this case reducing the diplomacy will not fix it but reduce the occasions when the game is broken.
IMO Diplomacy functionality should be overhauled.