If the chalky looking color is oxidation then the AIO should take care of that for you. Do you have a machine to do this or are you doing it by hand? Out of the products you want to use I would say that DACP would be the most effective at removing swirls, but that is a tough job to do by hand. Hopefully you have a machine to help you out.