One option you didn't mention was syncing everything to the cloud, and then redownloading it all.