SOLVED
OK, I've done a factory reset, restored my backup and it seems to have worked - at least Photos seem to be uploading.
Have .APKs ready for Google Play Store, Chrome, things like SwiftKey keyboard...
EDIT: Yep, everything's working fine after factory reset.