Which had more impact on the net?

Actually, my vote goes for #2 .. in terms of sheer number of
prefixes whose routes were affected (obviously a question of
how you define "impact..") Take a look at the following:

      http://www.renesys.com/projects/bgp_instability

These pages contain some unsettling analysis of the effects
of Microsoft worms like Code Red II and Nimda on global BGP
routing instability. They've been significantly extended
since last week, and we *strongly* invite the NANOG community
to send us supporting data (or even anecdotes, let's be
generous) from the propagation periods.

We were shocked to see how little sustained global effect
on routing stability there was from power outages, train
wrecks, backhoe fade, and the like. In terms of generating
sustained routing noise and affecting (at least transiently)
large numbers of prefixes, the worms win hands down.

--jim (cowie@renesys.com)

I read over it quickly, a lot of great data.

One thing you may want to consider is the difference multi-hop
BGP has in your data collection. For several years, router
vendors give priority to locally sourced routing packets on
local interfaces. But on multi-hop sessions, I believe that
prioritization is lost which may show up as more instability
than is actually present at the local BGP exchanges.