I finally gave up. My solution for photos has been to switch completely to Google photos. I ended up transferring around 5000 photos from both my hardrive (macbook) and my old iPhone. Somehow most of them seem to be there albeit with the size restriction that Google photos imposes. Larger resolution photos also remain on my MacBook. One issue surprised me. When I search in Google photos I found that all the photos were no longer according to date. However the ability to search google photos by image type(e.g. find photos with waves in them) is very cool and you can then find all other photos around the same date. The phone camera is outstanding and combined with the snapseed app can produce some superb images. It's a wrench breaking away from the Apple handcuffs but 3 months in I'm surviving.
... View more