Immich is a night and day improvement for photos vs nextcloud. You could roll it in addition if you wanted to try.