WOO WOO!!!! Crisis averted. In my original attempts to disassemble the lens, I went way too far, and I had some trouble getting everything back together. I had to disassemble the whole thing to get it back right. Of course I spun the focusing gear round and round and got it completely out of its original plane. I'll have to check infinity when there's light.
At one point, I mangled the little electrical fingers that run around inside the focus gears, but I managed to get them adjusted more or less straight and true. Does anyone know what information those fingers regulate? Maybe focus distance? Any ideas how I'd check that the data was transmitting correctly? The exif seems intact, but I'm worried it might affect SR or something like that.
Here's a shot post-repair of my 35 Macro. Focus on the 5, hit it spot on!