I'm not so sure, those screencap matches seem pretty conclusive! Maybe when they moved the entrance door they also repositioned the columns? This set plan only shows the original setup I'm afraid. For the actual episode the entrance was moved to the top left:
The Phaser Control Room is indeed a redress of the Gym, complete with very high vaulted ceiling:
All these double height rooms are going to make placement fun!