Your explanation mirrors mine.. 2nd disco and the gear change is slow to say the least, and the leaking sunroof, though only a drip every now and then, mine is a 2002 with 70k on it, changed the oil and filter at 58k but no difference to sluggish gears, I ignore it now and just arrive a tad later!!