My local garage has sealed the areas where they think water is coming in via the sunroof and although some improvement still leaking through the sun visor backing fixture on passenger side. He said the drain tubes were ok so is it worth me buying a brand new sunroof seal off e bay and getting that fitted? He reckons about 2 hours labour.