I do have a flat spot and quite a big one if I may add.

But I also took the pinion off when checking for problems and the shaft is good as new... well, except for the flat part. I think I will try the JB Weld or similar glue to put it back together, but I don't have high hopes...
BTW - how do you take the motor apart? Do you just push on the shaft toward the back of the motor or what?