Looking good Owen!
Owen clayed the Golf and I just turned up and did each panel (those affected by rotary buffer swirls) with Festool 8000 compound on a white foam pad.
About 8 figure of eight passes per 3sq foot area was all that was required to defeat the swirls.
When I pick up a paint thickness gauge I'll be able to correct actual scratches, after practicing on used panels from the local body shoppe

We carefully rubbed back the polish and applied Dodo Blue Velvet Carnauba wax by hand, let it sit for half an hour and then buffed it back to a glorious shine.
About 4 hours labor all up.