It would seem to me that the corrosion issue needs to be addressed first.
But surely that has been done by the internal cleaning and inspections? Only the two affected aircraft seemed to have visible corrosion, the rest of the fleet doesn't. So whilst you are right, corrosion seems to be the primary factor, there is now a process in place to ensure it doesn't develop in other aircraft.