A far as the damage have you considered a nice little silver inlet? just find one that looks good big enough to cover the damaged wood. Pinned barrels don't look fun.