Don't use non-e2ee services.
(Yes, there is an opt-in e2ee for iCloud now. No, nobody is using it because it is off by default and buried in settings.)
I use syncthing (e2ee, free software) to keep my files on all my machines. It has sane conflict handling and nice versioning backups. It even supports untrusted sync-only devices that never see plaintext so you can run a node on a vps or somewhere offsite safely.