I use a couple of things. All photos go to my local NAS (QNAP has an app that does this automatically). They also go to iCloud and I don't have the problem you

I use a couple of things. All photos go to my local NAS (QNAP has an app that does this automatically). They also go to iCloud and I don't have the problem you have with it but then again I use it only for mobile photos so I don't really care about sync as much as about backup.