I'm a relative newbie, but my belief is to both reduce and manage a water leak, rather than to eliminate it.
So... I did my due diligence regarding extraneous holes, resealing the mast partners deck plate(Cliff's Notes version), and using the stretchy mast tape Christian mentioned, but also...