As a long term storage option you might want to try "Ballistol" it was developed for firearms. In very extensive black powder tests it protected against rust like nothing else tested. As an avid black powder shooter I have come to trust this alone for rust prevention.

It is one of the few rust preventitives I have ever used that does not attack other materials like a gun stock finish or your favorite razors bone scales.

Dave