Maybe give https://librepcb.org/ a try? The file format is optimized for version control. While it isn't yet as feature-rich as KiCAD yet (e.g. no differential pair length matching, no 3D preview) it tries to do better in terms of usability and library file format.

(Disclaimer: I'm a contributor)