If you come to Barcelona city...you can visit Jordi Rubio shop in Avda. Gaudi 56, in the center of city, Underground Line 5 (blue), Hospital de San Pau station.
Also, there are a small militar museum in Monjuic Mount.
In Madrid you can visit Juguetes 113, another amazing shop with a lot of stuff and friendly shopers.
Valmojado 113 street.
Also in Madrid there is the GOLOSO Museum with PzIV, T26, PzI, and much more tanks.
All the best and good luck in your trip. If you need help in BCN...please, contact with me.