Thanks everyone.
@Jon c, I think you are recommending adjusting the wiring so that both the light and fan are switched (Option 2). If I dont do this, as the fan has 2 live terminals I would need a fuse for each live (I haven't been able to find a dbl fuse isolator).
@Jackrae, are you saying...