I ended up with a wax called Smartwax. The worst thing was getting rid of 1 million little flies that had decided to commit suicide on the roof of the car leading up to the car wash. Their little wings had burnt and glued themselves to the roof and could only be removed with Mer polish.
After I got the car looking as good as I could I set about applying the Smartwax. Very easy to apply and pretty easy to remove too. The only thing I would say was it was difficult to remove from the black plastic trim pieces and kept staining them with light/grey patches. This was only remedied with back to black bumper trim restorer.
My shoulder ached for days afterwards.
Time for a wash again