what a great project, glad you are back on it.
my advice: buy the windshield, seriously. I did some math, figuring that I needed new glass, new hardware, new center bar, new glass tape, new gasket, it would have cost me around $400, AND still need to repair the rust in the lower channel, AND drill out and tap all the rusty hardware, AND put it all back together. for double that I could bolt it in and put my not very rusty one with broken glass on craigslist.
bowtie bits is local to me though, so no expensive shipping. jeff is a dynamite human being too, I got a bunch of stuff from him when I stopped in last, and I will get some more this week.