I went with OneDrive for all pics. On Mac I import all pics into a folder per year/yyyy-mm-dd. This makes it available in my Android phone too. On phone use OD

I went with OneDrive for all pics. On Mac I import all pics into a folder per year/yyyy-mm-dd. This makes it available in my Android phone too. On phone use OD to upload phone pics to Camera Roll folder, which I rotate into separate Dir every year. The OD web interface is good enough and I like the simple folder hierarchy. I also move and delete a lot of files around. The OD syncs this quickly to web and phone. Lastly I like the recycle bin on web interface because I can see good size thumbnail of deleted file and also metadata to make sure it wasn't something I deleted by mistake. This is a huge plus for me over DB and GD. Only downside of OD for me is no Linux client, so limit picture management to OSX.