Yes the diagram looks okay - though I am not sure what you mean by 'ring'.
You will normally find the loop containing two cables (2 loop live, 2 neutral and 2 earth) and live/switch live. Or if at the end of the circuit - one cable the LNE and live/switch live.
Sleeve the earth wire - what size are those terminal blocks?
To be tidy I would use 15Amp terminal blocks and use just four.
You should be able to put the three live into one terminal block - the two neutral into the second, the earths into the third and the switch live into the fourth.
Then on the other side of the block connect your switch live to your lamp live, the neutral to the lamp neutral and the earth to the lamp earth (if it has one).
If you need to find a tradesperson to get your job done, please try our local search below,
or if you are doing it yourself you can find suppliers local to you.
Select the supplier or trade you require, enter your location to begin your search.
Please select a service and enter a location to continue...
Are you a trade or supplier? You can create your listing free at DIYnot Local