Windshield salvation?

Top wiper W/S.

Problem #1 When I had it folded down and was bouncing around a bit, I knocked loose a small pile of surface rust, which accumulated near the defroster holes, eventually.

Problem #2: When I bought electric wipers thirty years ago, they came with some really cheesy arms and blades. I think the blades were made of something like #6 grit abrasive. Consequently, my glass has a nice grind in an arc shape. Does wonders when driving toward the sun.

I'm gonna change out the glass, but while I'm at it, I want to try (something) to contain any more damage, before I clean and repaint the frame. The bit of rust I saw is only in the defroster plenum, of course.

Worthwhile? Prolly anal, I know, but sometimes I try to do things right while I'm at it......

All considered, the frame is in great shape, except for that.