Same, added an always-on Raspberry pi + zerotier to the mix and got rid of the sync issues between my phone, laptop and workstation all at once.
I wish there was something to make some sort of CRDT for modeling org though. I feel that the operation that ended up causing text conflicts in the past had obvious resolutions with the right structure and Metadata, but yeah, resorting to having a peer always on gets around it more easily that writing my own thing and deviating from emacs and orgzly
Funnily enough, crdt.el exists. I've tried it for org-mode syncing and the only thing that broke it was having a Windows Emacs connected to the session. It felt like line endings weren't getting handled properly, but I got frustrated with it and gave up in favour of Emacs in a tmux window on a raspberry pi behind my monitor.
I wish there was something to make some sort of CRDT for modeling org though. I feel that the operation that ended up causing text conflicts in the past had obvious resolutions with the right structure and Metadata, but yeah, resorting to having a peer always on gets around it more easily that writing my own thing and deviating from emacs and orgzly