Yep, I’m cozying up to the idea of just moving back to iCloud. Even, turns out that since last September there’s functionality to pin down files so that they stay on-device, which should make it even better than it was.
@Kaleo , how frequently have you seen problems needing of mitigation through git? I was pretty happy with plain iCloud during the months I used it.