So the saga continues. I got the warranty replacement, and had an adventure with my car, a 2001 TDI Beetle on the way. I lost all of my oil on the trip to Alameda, which is an island, and the expense of towing back to San Francisco would have been quite high, so I had to leave the car behind to get repaired in Alameda. The oil supply line for the turbo failed. Apparently it had never been replaced, even though we had the turbo replaced not long ago. Fortunately my usual mechanic warranties their own work 3 years/36k miles, so they are going to reimburse me for it.
Then, when I got home, I munged the job of putting the wheel on. I had replaced the stock Schwalbe Marathon Plus tire with the Schwalbe Marathon GT 365 I like to run, thrown a disc rotor on to temporarily plug the rotor holes from moisture until I can get plastic caps to do the job, and installed a new cassette. I was torquing the drive side axle and sheared the axle right off. Talking to my mechanic, I guess it's better to tighten the non-drive side first, which has the torque arm, because the extra wiggle can introduce extra torsion into the axle and shear it.
So now my options are $750/7 weeks to round trip it to and from Germany again for repair, or $1,000/1 week for another new wheel at retail cost. Doh!