You could have the CMP re-barrel your M1 and go over the entire rifle.