I ended up using AutoGlym HD ceramic on the paintwork, very easy to apply and remove. It is very hard to get it wrong, so if it over cures then it is easy to remove.
I did use AutoFinesse Caramics for the glass, easy to apply with the wipes, and has some crazy beading!