Thanks!!
To paraphrase, in terms of my wires, I have two T&E cables.
On the one from the switch
The live wire goes into the live on the CU
The earth goes into the earth busbar on the CU
The neutral goes into one part of the terminal block
On the one to the light
The live goes...