So I'm lucky enough to have a Hardtop SW which means not worrying about leaky targas.
Ironically, it has a sunroof with leaks. My car was pretty wet today.
I'm not sure how much sunroofs add to the car value, but would it be worth getting it professionally repaired, or just ripping out the sunroof mechanism and just sealing in the glass plane so it would basically be a normal hardtop with a glass roof. This would add a little more headroom in the car and ditch some weight also.