My main issue with iCloud Photos is that there's no way to disable auto-upload. The idea of every photo I being uploaded in an instant to iCloud is such a deal breaker for me.

As far as I can tell there's no option which can replace the Google Drive + Google Photos functionality they are deprecating here.