As a follow up; I ended up using flash throughout with no filters at all. The light was really lousy (a mix of dimmed tungsten plus the remains of daylight). Still not got 'em developed, so have no idea what they'll turn out like.

I shot Neopan 1600 in the F4 and 800Z in the F90x - will develop the neopan myself, and send out the colour stuff