Apologies i didnt take the take the time to read the entire thread but i just saw the thread name and wanted to throw in my two cents since this leak issue is just dreadful to deal with.. you think you fixed then then after it rains your carpet is all wet..So i had a similar problem as well and its really annoying, i ended up rerouting the passenger side sunrood drain to the ac condensation drain line
And i also noticed there was a big of a gap between the roof trim and the windshield (yes the long chrome trim that extends along the roof) i ended up replacing that and caulking the seem to ensure nothing leaks and i havent seen a leak since