There are lots and lots of good shampoo's, but I like Chemical guys citrus wash and gloss. AG bodywork shampoo conditioner is also very good.

II wouldn't bother spending more money on polishes, SRP is very good. By all means get a wax. The problem is as someone said that you are probably masking a lot of the swirls with the fillers in SRP. After a short while these wear off. The best course of action is a proper machine polish to get rid of the swirls.

Also, for drying get a decent towel rather than a chamios.

Rick