Two things I note.
1) Black wire in junction block.
2) Single wires in switch.
So it would seem wired power to switch and then from switch to light which is not the normal method.
Normally power goes to light and from light to switch.
I will admit once you lose the original wiring it's hard to trace wires is conduit it is a pain staking job. Sorry duty calls I'll try again latter.
Thanks for the input. I did notice the that the black cables are in the switches downstairs but not on the upstairs switch. mentioned it to the sparky and he said the upstairs ones are just straps??