To get away from that cut-away look, replace the block wall. When you cut into a wall with a corridor, it removes the wall section where it comes in contact with it. Simply select the proper wall from the library on the left, and using the "M" key to place it, put it back where it should be. Then add a door that works with the wall you are using.
See attached image.
Using sci-fi segments with WWW2 segments is always going to be a little odd, but this will work for any combination. Without the use of a door, you are pretty much stuck with the cut-away wall.
As for the proximity of the switch, look in the fpi script assigned to the switch's AI Main (probably switch1.fpi) and change the value:
plrdistwithin=50
to a smaller value.
Happy Game making.
The forum provides a means to hide our true identity. Too bad we always screw up and let it be seen.