I would rethink all those walls before getting too deep into track planning. I would consider moving the computer/media room down the wall on the right. At a minimum, eliminating the wall that is horizontal in the drawing would let the layout go all the to the wall instead of needing an aisle to get to that doorway.
The late John Armstrong made a distinction between physical constraints and political constraints. I feel your layout area is over constrained by political constraints.
