Great suggestions.

One thing to add is that all the federal museums are free of charge.

Also, at the Bundeskunsthalle they have events almost every night during the summer (eg, I saw Alanis Morrisette in concert there...) - you do have to pay for those though .