Hey Marcus have you given Attachment Files Importer a test run to see how well it works? If not, I'll go ahead and give it a shot because it's a major pain point in the WordPress importer right now.