From what you describe, an OA bath sounds like it might be overkill. Your plan sounds good to me. You could also treat any rust areas with something like Evaporust, which will chemically convert the surface to something benign.