use a better window cleaner.
and for removing light scratches that look like swirls?..u can see then in the sunlightYou can use the finest grade steel wool I use 0000 I run a glass company we use it to clean mirrors and it doesn't scratch just make sure your windows are clean. It will also remove waterspots from your windshield and windows.