Black and White is the proper barrel finish.

You will likely have good luck getting the truoil to do what you want it to. For scratches, i would maybe try wet sanding them out if they are just in the poly. Finish itself will usually not do much for filling in scratches.

B.Dudley