One last suggestion. IF there is a possibility you won't be painting the car, then leave it in bare metal so the painter can work it up using matched primer and paint. My guy won't guaranty his work if someone brings him a car in primer....for probably the reason you're doing yours a second time.
It's your car. Do what you feel best. But I wouldn't run the risk a second time