I only use silicone free polish, usually Farecla brand, as silicones wreak havoc when you're trying to paint stuff as I find myself doing fairly often in & around the garage.
Cut back any marks with G10 finishing compound, then 2/3 coats of Wax Top and, if I'm really going for it, then Black Top hand glaze to finish it off.
Looking at their website suggests they've changed the names and they're maybe now G3 Wax and G3 Glaze.