Craig,
This is how I would personally, wire a two-way, as well.
I would run the straps in 3core+Earth, even though you have an extra wire at the other end(green), at least it complies!.
There are an endless combination of ways that you can effect this circuit, which can come in handy if you have to alter the circuit later on.