Maybe something like delta? This is still pretty new from the folks that make Zed, but looks promising and would address some of the things you mention https://delta.dev/