OlafTheRoofer
I have that location cleared and the switches still work. See if this works:
From Diggy's spot in your screen shot go N, W, N, E, N, E, then N all the way and take the stairwell.
Then make your way all the way across the level to the NW corner and take the stairwell.
Next, go S, W, S, E, S (crossing fingers about the switches here), S, S, S, E.
Hopefully that lines you up for a horizontal run to the treasure room going the right direction through the switches.
