Have to agree - Clay the car.
I like Meguiars Pro - available in agressive and mild versions.
Second would be Zaino, then Mothers and Meguiars store packs.
Next loose that fake chamios - get a good quality waffle weave m/f drying towel. You need some nap in the material to lift residual dirt from the surface when drying. (Critical on black to avoid swirl/scratches)
Since yours sounds pretty fresh you may get away with hand removing the swirls - if not then get the PC polisher.
Then ZAINO ZAINO ZAINO.
PS
....I would not let the dealer touch the paint!