Thought I'd commented in here again, apparently not!
Picked one of these up a few weeks ago with some body prep shampoo conditioner and Auto glym Aqua Wax.
Pretty much followed your lead Dean and washed car first, then clayed panel by panel, followed by a final rinse and application of Aqua Wax. I was so happy with the results until the rain came two days later and put my three hours of work back to square 1