The drainage you want to sort ASAP, personally I'd leave everything else, just remove the glass, Stanley off the gasket extrusion, replace with 10mm security tape then re glaze, not ideal but it will be secure and watertight, I get a feeling your builder and supplier are now passing the buck, this maybe your cheapest option.