Even more than that if you really want a good shine... you can even bring sealants and glazes into the mix.
A guy on a local board has a GT-R and does detailing for a living (side job). He has like 8 things he applies to his paint, but it's one of the cleanest cars I have ever seen in person.
EDIT: I spoke to him. The best way to prevent swirls in paint, is never use a sponge, use a ph-neutral shampoo with good lubrication, and never use cotton towels. He said wax will have nothing to do with protecting from swirls in the paint, though it can help mask them.