You may already be aware of it, but jupytext solves most of the problems ipynb files cause.