One thing I wonder is whether the idea of super-large offices with one team per office might be a good compromise. You get the team cohesion and collaboration

One thing I wonder is whether the idea of super-large offices with one team per office might be a good compromise. You get the team cohesion and collaboration but also some isolation, and the team can figure out how to be productive.