Munich is still the city with the most IT jobs and companies - I don't know if Berlin will catch up.
Berlin has this start-up flare image, but based on numbers that's just not true.
I agree on Munich - and most of its startups are in tough topics involving hardware such as robotics, IoT etc. Still believe that engineering B2B is a better fit for a startup company in Germany than the often B2C model in silicon valley.
It'll probably still have two airports.. Luckily the flight to Frankfurt is short and from there you can connect to most places in the world. But wouldn't be surprised if Tegel gets a few more direct connection to the US west coast.