There is no point in replacing the fabric until you fix the leak. Check the around the sunroof, anything noticable as far as rust? or damaged seals?