Definetly #2 and or #1 should do the trick and you can just spot treat them for the show you have. But if you just want it to look good just for the show try using just the glaze (it might conseal the light scratches you have for the show) and then your not "wasting" the products you want to...