Last week I waxed the XF (using McGuires NX2 of course).
It just didn't give me the smooth feel I wanted.
Today I broke down and clay barred the entire car.
Now it is smooth as it should be.

Wonderful stuff this clay bar.