Efl, have a look at Bernard's layout, provided he moves his switched wire (the blue to the lamp) to middle rail in the JB, and Live to the bottom rail in the JB, his logic then works exactly right as per OPs situation, and this is without the need for a short anywhere, so although my layout only meets the logical status with a short, Bernards does not require a short as long as you move those connections I mentioned above.
hence I think Bernards amended layout would be the likely case, but then again who knows until one gets there to find out it could be either, now how OP's electrician solves the problem depends on his ability to figure out or trace individual cables, isolate them from switches and marks each run and then rewire as a 2 way switch should be wired.
(BTW I do not criticise anyone, no one is perfect, sometimes even a team of highly qualified scientist can get things wrong the first time, and can take several attempts to get it right.)