I noticed the marks on the edge a few months back, but they are getting worse. The marks on top appeared around the same time, however I can usually clean those off with a microfibre cloth. I need to apply a lot of pressure to do that, though. The marks on the edge never go away.
If vinegar won't completely remove the spots then try isopropyl alcohol. Since it is launch day watch your oleophobic coating is gone or mostly gone. So it may be hard water spots left in the remains of the oleophobic coating and take vinegar and isopropyl alcohol (not at the same time) to remove.If hard water marks and damp cloth with vinegar should remove the spots. The coating on the face is likely gone at this point so it can not hurt to try.
Thank you all for the ideas. I will try both. I've been reluctant to try alcohol as I know it will strip the coatings. However given they're most likely gone anyway, I'm willing to try.