You stated "corrective waxes", but waxes will not correct swirls or scratches. Did you use an All-In-One (AIO) type product that has polish, cleaner, and wax/sealant? If you used a glaze then the glaze will fill scratches/swirls, but will come out over time as the glaze only hides or covers them...