Thanks for the advice. The lighting circuit is a bit like spaghetti so it is going to take some sorting out. As per earlier comment, the original fan wasn't even installed with a isolator so I'm hopefully now moving it in the right direction.
It's a Manrose MF100T fan, and, rather foolishly...