When the stock is returned to normal, however you decide to do that, make sure the barrel channel is sealed from moisture. A lot of times the barrel channel is left unfinished by manufacturers. I too prefer linseed oil and wax.
Also remember, wood warps toward the driest side. Think about how a sheet of plywood curls up towards the sun.