I'd say more or less the same concerning basic structure.
In fact, I don't believe that humanity will necessarily stick to the "Airplane" design of Space Shuttles, as soon as wings are not needed anymore for flight in atmospheres due to spacecraft being assembled and operating only in space.
IMO the current space stations' modular setup looks too fragile to safely move through space at a reasonable speed.
A third, very popular desigh, which I would think, will win the race in the long run are ships.
And if you take away the elements a ship needs for buoyancy and put most of the top parts under deck (for example into a half-circle-like structure below the main bridge)...well: