Magpie - Wow - are you ever organized! Good use of the parts box to store the components!
Try soda blasting. I was skeptical until I tried it. Works great. I bought a cheap blasting gun at Princess Auto and a big box of baking soda at the grocery store. Do it outside, the soda goes everywhere. But it works great and no serious abrasion of the parts, just cleans them up to the bare metal.