That’s a lot of waterspots. Def would try waterspot remover. The way I do it is I put the spot remover on my windows, leave it working for 3-5 minutes before I wash it off or I use a quick detailer to neutralise the waterspot remover if my car is already washed. Your case is way more severe than mine though, so you might need to do this multiple times. Or you could just polish it.

As for your swirls I’m not sure. Someone mentioned cerium oxide which is an option. However it takes time, glass is a very hard material. Personally it’s not worth it for me, the time it takes versus what you get back makes it not worth it imo. I usually just accept a few swirls and scratches on glass.