If you get to Stockholm, apart from the Vasa it is worth trying to find the Swedish Army Museum.
They don't have a lot of pre-18th century stuff, but what they do have includes a really good collection of captured Russian and Saxon standards, also an Ottoman tent from the siege of Vienna, and an interesting display of early incendiaries.