There are many vids on YT that shows were the common leaks are. Why not address them all and be done with it! Just grab your caulking gun and a get a tube of Silicone Max Clear 100% Premium Window, Door and Siding Silicone Sealant, and go to the areas noted, clean/prep area and caulk.

 

I had the same problem and had to silicone the top of the molding from the outside to stop the leak

 

 

so you filled in the channel with sealant? is that where the water is supposed to drain to?

 

What did you do to the roof marker lights? I believe I have the same problem. Did you get new grommets?

 

Rather than trying to find replacement grommets, most just go to town using silicone and push the original grommet into it - that is what I did, and it hasn't leaked once in years

 

Nice work on the oem upgrade!