What to do: 4 seams around the windshield frame

[SkidmoreGarage]

I am tackling my windshield/drip rail right now on my '67. I had water getting in around the gasket, as you can see in the photos. The fit up around the drip rail/roof/windshield is pretty poor and the factory seam sealer is barely there/in the wrong spots and very porous.

I think that the water was getting in behind the seal through the frame seams (follow the rust).

Is there anything that folks do to improve on these areas? I have 2 part seam sealers, a welder, and short strand body filler at my disposal.

Thanks!