You are aware there are two type clips for the trim?
There are 16 that go up both sides and across the top. Then 9 as I remember that go across the bottom, they are a longer type. The others are small and square.
I had to locate them as the shop was out of both styles.
I might have bought them from Bronco Grave Yard.
Did a search and found them.
Windshield trim clip kit set of 20
shop.broncograveyard.com
If you drill holes to use the Pop Rivets, good idea to seal the holes or a rust issue or leak will start.
There are the little button thingys the clips attach to.
Goat