Exactly what I was gonna say. My background was marine manufacturing boat Co. you need to use a heavy duty rivet . The regular ones usually don’t have the pinching power. You can do a research on Amazon on different types. To give you an idea first measure the area the rivet in placed and maybe you can get one with a larger head that’s aluminum and the mandrel is Aluminum . Stainless is stronger but you get a galvanic reaction due to different materials. Buy 2-3 brand new drill bits to drill all the holes. You can drill the holes in same cross pattern as if you were doing the head on the car motor. Drill hole put in a screw to hold window while you cut other side and put rivet in holes as you go. If the rivets won’t hold the window in place use 6-8 small screws with nuts finger tighten as you go . Once window is secure start with one rivet and tighten the screw next to it as much as possible then pop the rivet putting even pressure . Once done go to other side do same then bottom corner. Continue on until all are done remove screws & nuts and pop them in . I know you use buttel tape but use a clear silicone caulk around outside after it’s detailed and you will not have
leaks. Sorry if it sounds a little vague but given this response 100 times over the years for dealers doing warranty work on our boats .
Just some food for thought.
Mrrobalo