Took the wheel off. The speedo unit comes right off after the axle bolt is loosened/removed.
I can see the two notches. I cleaned, and then dabbed a good amount of Silkolene WaterProof racing grease behind the speedo (against the bearing, in the recess, in the notch, etc) and then fitted it correctly. It took me about 5 minutes to understand what the "right" fit feels like by fiddling with it. It may have been correct before.
You'll need a long 22mm socket to torque the axle nut. 19mm is my biggest. So I decided to man wrench it. Got it pretty darn tight using two wrenches. I don't feel that it's going anywhere.
Flipped the retainers around per the service bulletin. I went to 25-30lbs for the front retainer nuts. 16-18PSI per the manual seems kinda low to me. Gap in the rear now. Torqued the front first.
Wheel seems to spin better now. With a good push on the stand, I can get a revolution...maybe a little more. I probably should re-adjust my caliper now that this is done. That's an easy thing to do...adjust until it rubs, then back off a little.

This may have gotten rid of that faint metal sound that I hear.