Matching the blueing is going to be trouble. Birchwood Casey makes a decent product. If you decide to redo the gun, heating the metal makes for a better finish. Remove the stock and break the pieces down as much as possible, then put them in the oven. Look the process up online for details, I'm not sure how long you bake a 336 for.
