A mix plantuml for constrained no-frills diffable standard diagrams and yEd for actual manual placement and boxes-and-arrows drawing - local editing, both can be scripted to export to an image format - is a good local optimum. I haven't found a much better combination for years.