The only thing I've really found that works for me has been ilograph[1] that allows you to draw your diagram and then create different "views" into it depending on what the focus of the diagram is. Here's a wonderful demo of what it would look like converting some AWS architecture diagrams into ilograph ones[2].

I'm not affiliated with this project at all - I just really love it.

[1] https://www.ilograph.com/ [2] https://blog.ilograph.com/posts/fixing-aws-architecture-diag...