RE: Engine storage (long term)
From what I've read here, Corrosion X is the best for that. A lot of people use ATF and Marvel Mystery Oil for air tools mixed half and half. If I had access to a can of Corrosion X, I would use that as my first choice.
But, you are right that the castor will coat and protect to some degree. And, it does flush out.