I think after the p21s Concours, you are done. I am not sure but you can add another layer of p21s, maybe...
You can also use a claybar before doing the wax, that is if you have any contaminents on the surface. Also, do an IPA (isopropyl alcohol) wipedown after the polish. Or you can also apply a glaze between the polish adn wax.
