Restore scrollbuffer and tabs in iTerm as Terminal.app does
What you want is implemented in the night builds of iTerm2. Follow the instructions to enable window restore and you should get what you want.