From what I can see, youngbart, both of your drawings are correct, that is, both will work.
The easiest one is to grasp is your top drawing and probably the one to remember
The top one is an adaption of a two plate wiring system and the bottom one is an adaption of of a three plate wiring system.
Now whether it is acceptable to use a 2-plate method in T&E or whether it acceptable to take a neutral down to the switch for a 2-plate method are open to debate.
However, if you are still in doubt I would draw out 16 little diagrams, tedious I know, but you'll have a handy reference for the future.
The easiest one is to grasp is your top drawing and probably the one to remember
The top one is an adaption of a two plate wiring system and the bottom one is an adaption of of a three plate wiring system.
Now whether it is acceptable to use a 2-plate method in T&E or whether it acceptable to take a neutral down to the switch for a 2-plate method are open to debate.
However, if you are still in doubt I would draw out 16 little diagrams, tedious I know, but you'll have a handy reference for the future.