Sunroof drain repair... again

[exsemperfi]

So I know that there are other threads discussing sunroof drainage however after much searching and reading all of them lack one thing..... a description of how to perform a solution. I did find one fairly detailed post about how to fit the rear drains however my problem is with the front drains on the sunroof. I have severe leaking from behind dash and down the passenger side door trim/kick plate to the floor board. I could actually see it running down during a storm last night.
Someone must have correctly fixed this problem before and could hopefully write a description of how to do it properly. I purchased this car 3 days ago and other than this issue is in great shape.