Sounds like a plan. I don't wash again after I polish, but whatever floats your boat. I'm not sure that polish is going to completely remove your swirl marks, but I always go with a mild polish used infrequently to keep as much clearcoat as possible. Besides, whatever swirls you don't get out,
NXT does a great job of hiding. However, in my experience,
NXT just doesn't seem to hold up very long. Will probably be going with another LSP after it runs out. Good luck.