Enterprise Integration Pattern Solution drawing tool
diagrams.net has a set of EIP stencils built-in. I'm not sure if it addresses the issues in the question, but the tool is free. (I'm a developer on the project).
[]
Btw you could automate that. Check this:
http://camel.apache.org/visualisation.html
Use camel:dot maven goal
I've created an OmniGraffle EIP stencil years ago for the book Spring Integration in Action. I pushed it to Graffletopia, but I cannot find it there quickly. Let me know if you are interested in the OmniGraffle stencil and I'll search a bit more.