Right, so dropping the headliner seemed a painful job, plus I’ve never used the sunroof. So I’ve just sealed the sunroof shut with some UV & vibration resistant bond adhesive & sealant (I used a product called CT1). My motor’s black so I got away with using the black coloured version, so it looks pretty much factory finish, pretty tidy job. It’s just started raining enough to cause a problem and happy to say no more leak.
Now just to put the new air suspension module in when it arrives & cross fingers everything works. Also need to remember to pull the sunroof fuse out when I figure out which one it is.