I can attest that the Templehof airport tour is really awesome. Another really cool and unique attraction is the Boros Bunker. It's an art gallery in one of the last remaining Nazi war bunkers that Hitler constructed in the 40's. They have tours of the art and allow you to go underneath into the basement (bomb shelter) and it's really really cool. Could be another option!