In Mermaid, while I like it a lot, you lose control of layout positioning. Does the auto-layout position large diagrams (many shapes + connectors) appropriately?

The Excalidraw export format is JSON, so you might use that in source control just as well. Or include the format in PNG or SVG export (which draw.io supports also).