Well, there has been a shift in emphasis in the Viking narrative (look, dad, I can speak po-mo!) from the warrior/ raider to the farmer/ trader/ colonist. In Sweden at least partially as a well-meaning (though perhaps misguided) attempt to neutralize the adoption of runes and Viking style art by the Neonazi movement.
However, recent excavations at Birka have focused on the fortifications and the warrior´s halls and just recently a very good thesis was presented by Neil Price "The Viking Way. Religion and War in Late Iron Age Scandinavia" so the warrior aspect is still there.
Malthus, the Sagas tell more of 13th century Iceland than 9th century Iceland - read with care. [EDIT: Sorry, didn´t read your most recent post - I obviously didn´t need to tell you that...]
It is interesting though that an entire era is dubbed after the Vikings as they were very much a miniscule minority in Scandinavaian society at the time - it´s like calling the Roman era the Legionnaire Age.
Cheers,
Vandelay