Second stab at family photo storage:
Piwigo is very promising so far. Fast to set up and get going, plugins very quickly sorted initial bits of missing functionality. Auto-upload from phone just goes full speed right out of the gate.
Will run this in parallel with the fruit company service for a while, evaluating as we go.