I use iCloud, had a lot of issues to begin with but in the end i totally deleted my iCloud Library, waited the 30 days for it to all be permanently gone and then re-added everything from my mac, only allowed it to sync to iCloud after everything was added to the mac library, now everything works super smooth from both ends!
Photos is one area where Google has left apple in the dust. The Google search/categorization features are so good that it's almost scary, definitely a game changer for photo organization. Hopefully Apple will step up its game, they're leaps and bounds behind when it comes to this technology.
Google photos has every photo I've ever taken (well since the digital era). iCloud just left enabled on my wife's phone and mine as a second backup of anything we capture on the phone. Plus it is good for backing up live photos/slomos that Google doesn't properly capture at the moment.