Wind Sreen Bolts (replacement)

[JHRII]

Hello all,

Just a quick and hopefully simple question. I took the wind screen of my XJ to clean it up. What was once yellowed and nasty is now clear and nice again. While removing it, I found that some of the bolts were not original, and were quite rusty, and the ones that were original were in fairly bad shape as well. Also, the little rubber , I'm going to call them grommets, that pop into the holes behind the screen to thread the bolts into were all missing.

The question is, has anyone come up with a good and easy to get alternative to replace these with? Or has anyone found any wind screen bolt sets, say on Ebay that will work? I have seen and am considering a set I found on Ebay.

Thank you for your input!