Looks like a real good approximation.
The one thing I would change is the placement of the one glass panel. I believe it actually further away than it appears. Looks to me that it's right next to the turbo lift - separating the lift, from the rear workstations. In fact, behind Spock, there may be another panel to the right of the turbo lift door.