Wax or paint cleanser? The wax is always, without question, the final stage. Paint cleanser takes the place of the polish, as you don't need to use polish everytime once you've got a finish you're pleased with.

Gareth