Guess this is too late, but for future reference, if anybody is a science or tech geek of any measure, check out the German Museum (Deutsches Museum) in Munich. http://en.wikipedia.org/wiki/Deutsches_Museum

For Berlin, agreed on the Pergamon Museum and if you have spare time visit Nefertiti (well, her bust...) at th e Altes Museum (http://en.wikipedia.org/wiki/Altes_Museum).