Same - I had this leaking as well as the sunroofs :-(
But yeah, moved the striker plate and the plastic guide plate above it (mine is a disco2, dunno if a disco 1 has that too?) and it now takes a bit more effort to slam, but makes a satisfying 'clunk' noise when it is shut properly!
David