Isn't the Citrus Wash used as a pre-wax wash (to strip wax\sealant)? Perhaps this explains why you are seeing swirls--have you removed your sealant\wax?
Try the P21S Shampoo or the Dino Juice Born to be Mild (the purple one).
To remove light swirls, try some Klasse All In One (AIO) and then finish up with P21S Wax. Both products are VERY easy to use and extremely cost effective.