You will need that "Good " automotive glass guy if you plan on resealing or removing the windshield, they are a difficult/ expensive item to replace if it gets broken. Another thing to check is the belt line molding on the doors, I have seen situations where water slides down past the glass and comes out the bottom of the door onto the sill plate into the car. Make sure the drain holes at the bottom of the door aren't blocked, same for the cowl when you do the wiper bushings. The belt molding gaskets are available aftermarket, don't remember who has them.