i wonder though how the expansion will change things...
There are no new town tiles, no new favor tiles, but you will have about 20 new land tiles. I'll have to check but I think there is enough room for the terrain tiles.
That being side, expansion content plus original game materials plus the game trays will not fit in the original box together without protruding significantly. No biggie though, I like keeping stuff seperated.