Depending on your fabrication skills you could make a replacement panel to eliminate the sunroof, or source a XJ without a sunroof at the junkyard and use that roof to make your "patch panel". Another option might be to source a factory sunroof from another car with a similar profile and patch that in. You'd have to make a custom headliner but that would eliminate the leaky Jag roof.