Polish, then wax. You should strip everything. Use the nu finnish then seal with a real wax no spray wax. Then in between wax's use your "wax as you dry" while drying, but use a waterblade and a microfiber towel insted of the absorber.. Repeat every month. And i would use a better polish.
Or skip the polish and use a cleaner wax
A good protector wax is colinite.