Thanks Bill.
Made another modification to my Evaporust soak pan for the rims, I bought a cheap dollar store oil drain pan with a 16" OD and stuck it down inside the 20" ID water heater drain pan. This should dramatically decrease the amount of Evaporust needed. Unfortunately I don't think the pan is deep enough to completely submerge the rim, I'll have to flip it over at halftime.
My 2 NOS replacement spokes arrived, and so did the 16 oz trigger bottle of CorrosionX, I purposefully avoided their aerosol cans because you can ship a trigger bottle on an airplane... The stuff looks like blue/green 2-stroke oil but smells like solvents and has some tough warnings on the label.
Edit: I'm also pretty stoked, just put in the order for the tires & stuff and a set of tank badges.