long term bugs are the worst then, because they never get fixed 🙁
I've uploaded everything again to OneDrive, manually pulled files off my phone, used the Photos in Windows to import and have the broken iCloud as a last backup.
Now I've just deleted all the pictures off my phone and will use OneDrive as the photos client.
Apple make great hardware....but software? Hmmmm...