If you look at the front edge of the roof gutters they invariably slope inward directing any water onto the frame/door join, judicious use of filler (or maybe some silicone sealant until you paint the car) to change the angle of the slope away from the door helps a lot.
The scuttle vent is a pain to stop leaking as you have already read, but the windscreen should be OK if you fit the new seal the correct way, there is an article on the main site with a diagram….
Also make sure the drain holes in the door bottoms are clear so the water that runs down the glass can flow back out of the door bottoms……