Bumping this up as it worked for me. The key was to remove the extra lang files that arn't used for english. I was getting errors with the full flash and zune was giving me the 8018004d error.

Thanks HD2-WP7!