I've heard of Zaino, some folks on other car forums swear by it. You might also look at
http://www.detailersdomain.com and check out the 'starter kits' they sell.
I went out recently to Advanced Auto Parts, and picked up a few items:- Scratch-X (MeGuiars I think)- MeGuiars clay bar kit (detail spray, clay, microfiber cloth)- Zymol wax (the blue stuff)- MeGuiars Gold Class paste wax
I used the above items on my fiance's Subaru Outback Turbo and my GTI, in the order mentioned, with pleasing results. The Scratch-X does a fantastic job of removing scratches that go no deeper than the clearcoat, and I wonder if it'd work for your swirls.
I don't have a garage, or storage for tools like a buffer, so everything I do is by hand. Takes 2-4 hours per car, but the results are worth it
As far as crevices go, use some blue 3M painter's tape and tape off all your black trim pieces, the gaps between body panels, etc and that will help immensely. Also for the gaps, use Q-tips or where possible, open the various doors / trunk / hood and wipe the edges.
Hope this helps!
BTW - I've used the 'free car wash' service once so far, and they do a fantastic job. It was delivery-ready again when they were done. But I still wash it myself as well