I always prefer to keep my polishes/cleaners separate from my waxes for big jobs.
Cleaner waxes are great for a quick "clean up" but if I have a large job ahead I begin with a cleaner or polish (as mild as can get the job done!) first then wax.
There are too many companies to list out there but I think every one has product and support you can turn to. I am a big Collinite Automotive Wax Choice of the Pros » Collinite