There's a couple of questions about strategy you need to think about.
1. Are the customers happy with the PC applied cleaner wax? Are you happy with it?
Because in general this is the safest way to go for you. Any time you start getting more agressive you run the risk of hitting a thin spot in the paint, possibly burning it etc.
That could leave you with a very angry customer, and possibly leave you on the hook for a new paint job. That is expensive.
2.) For scratches and little swirls. Is it really worth taking these out completely, vs reducing them, vs leaving them alone, when you think about the cost in burned off clearcoat.
To get the panel perfectly smooth, you will need to reduced down to the lowest point of the deepest scratch. In the mean time you will have burned off alot of perfectly good clearcoat. Is that really what your typical customer wants?
Probably not, as they just want the car to look good, be shiny and be protected with wax. Most of them aren't aware that scratches are removed by reducing the paint.
IMHO your best bet is to reduce scratches by hand by dulling the edges/cleaning them and after that leave them alone. The final wax will happly fill them up and make them seem even smaller.
What makes scratches visible are the sharp well defined edges, and possibly any dirt trapped in the scratch. This is what makes
pre-wax cleaner so valuable. It cleans out and softly abrades the scratch.
A quick dab of glaze will then form a thin layer over the scratch making the edges even less distinct, and then the final wax will flood the the scratch.
Note the 3 phases of the various multi step wax systems.
If you need something more agressive for a troublesome scratch, you could use some KIT scratch out or Meg's ultimate compound by hand to attack it. The Kit scratch out is both very cheap and IMHO quite good. Gentle though.
But even, then your goal is not to get rid of the scratch, but to reduce it to where the finshing products can take care of it well. Good hand technique is to polish 90* across the scratch for a while, then 45* L/R R/L for a shorter time, and then along the length of the scratch for the shortest time. Even if its not immediately obvious, 1 pass with scratch remover will improve how the lsp looks over the scratch, even if it might take 4 passes to completely remove it.
IMHO the key think is to focus on using a few products very well, rather than constantly trying to master a wide range of products, pads etc, many of which are mostly interchangable. It's cheaper too.
My $0.02