THANK YOU for all your help / advice.
I think I am just going to live with the configuration I have, & just put up with not being able to turn the main hall light off / on via the switch by the street door.
All seems ok other than that, no sparks / smoke / shocks, & have been at it for nearly...