daisypl, is your corrosion due to contamination with iron or carbon steel during the manufacturing process?
If so, you need to improve the processes taking care to prevent the contamination. Segregate the work. Use only new or segregated grinding wheels, wire brushes, drill bits etc. Cover plate rolls, forming tools, jigs, etc. with carpet, or use stainless tooling, and so forth. Then pickle and passivate.
Regards,
Mike
The problem with sloppy work is that the supply FAR EXCEEDS the demand