Do you use (and have easy access to) DI singles, then, or is all the wiring in earthed conduit?
I prefer stranded singles in conduit, but insulated and sheathed solid singles are readily available for when using T&E.
Insulated and sheathed PVC/PVC single brown, single blue, brown and earth and blue and earth are all available.