I dont know where you are geographically but I will what I know of
For tanks
The Tank Museum in Kabunka Russia.
http://www.tankmuseum.ru/
The tank museum in Samaur France
http://www.musee-des-blindes.asso.fr/
The Patton Museum
Imperial War Museum has a few pieces but its not a complete
There is another Tank museum in Boyington UK but I dont know much about it.
For Aircraft
The RAF museum (this is the best) outside london
Le Bouget Meseum (outside Paris)