I’m coming around to agree with your thinking on this: clean, wax, polish. The more I look at it, and the more cleanup, adjustment, and rebuilding of bearings I do the less I’m bothered by the scratches.
It’s starting to shape up! 👍🏼