I also have the frames out and mine were also pop riveted in place .
PPG products work great , pr1829 is a good choice for windshield and canopy’s. The PPG home page can guide you to a good choice, I also like there firewall sealants that can also be used and are easier to scrape off , and remain flexible and waterproof. Color choice is limited to gray, reddish orange, green and black , but they may have others. 2oz container is enough for both windows and is not reusable.
Dakazman