Thanks for the reply. Since I made the post, I thought, ah what the hell, do the job properly.
Since I already had the whole head lining out I decided to strip both roofs out too. I resealed the silly drain cups and also the plastic surround to the roof. I even sealed around the winders...