there was an area upstairs (which is now part of departures) where you could view aircraft from the windows
You're right, but I think you'll find that was essentially the connection between the two terminals, which, if it hadn't been glazed front and back would have been pretty dingy. The effect of providing a viewing area was more an accident of architecture than a deliberate attempt to provide a veiwing area, and that spotted glass made it awful to look through, and impossible to photograph through!
Bring back the buffet in the old terminal (that's the 1939 one) but leave out the terrible catering. Planeaddict, you won't remember that!!!