If you can live with the minor swirls, then leave it be. Sounds to me like it bothers you a bit, so why not polish them out?
205 is a solid solution for light swirls, but since it doesn't seem to be working for you, give the Wolfgang products a shot since you have them. Or you could pick up...