Well that iCloud sync solution didn't fix things after all. It's hung with nearly 6,000 files to go of 4GB. It's hung on something but there doesn't seem to be a way to find out what. Trying a few wild guesses then I guess it will be a nuclear option.