Things to do in Germany

I am heading off to Aero 2007 in Germany held at Freidrichshafen, on
this trip i am taking my son who is showing an interest in WW2 and other
'war' events as part of his school studies.

Where are the best museums and other aviation based places to visit in
Germany where he can get a good overview, and 500 photos over a couple
of days ?? Any help and ideas on places to visit is really appreciated
because i cant find anything locally from our travel people !!

Thanks Michael Coates