Repairing rear window frame

Hi all, I recently acquired a Snugtop Hiliner camper shell for my 1st Gen Tacoma. It's a great color match and fit for what I want, but there is some damage to the rear window frame and hinge. Specifically:

1. The top left rear window frame is bent in and down a bit, so there is a gap in that area when it's closed. Note the glass itself is perfectly fine
2. The hinge in the same area is detached / torn off

See images. My first impulse is to address #1 by gently but firmly bending the frame back into place, maybe after first heating up the bent metal section a bit. I think I could attached some additional metal and screws to fix #2.

But I'd love to hear alternative ideas. Maybe I just need to fork over $ to the local Snugtop dealership to fix it completely, but I'd prefer to at least attempt fixes myself. Then there's the junkyard option too if I'm lucky enough to find matching parts. Thanks!

 

Following up: I decided to embark on a do-it-yourself adventure for this one. I removed the rear glass door (gate + frame), totally disassembled the door, removed the glass, bent a bunch of things back into shape, attached 4 new rivets, and put everything back together with new gaskets, vinyl glazing, and a brand new pop lock handle.

It was more work than I anticipated and was frustrating at times, but it looks great and works perfectly now! I learned a lot about camper shells in the process. Next up: install 4Runner roof rails up top