Intelligence amplification and artificial intelligence are listed as separate scenarios.
Today, we have both machine-amplified human intelligence and machine intelligence - and that situation is likely to persist until we have intelligent machines that are roughly as smart as humans. Intelligence augmentation and machine intelligence are complementary - and are not in competition - as I explain here. Both processes are significant, it seems. Machines are built to compensate for our weaknesses. Such scenarios are the ones we are going to get - and they do not seem to fit into the categorisation scheme very well.
Today, we have both machine-amplified human intelligence and machine intelligence - and that situation is likely to persist until we have intelligent machines that are roughly as smart as humans.
I think the natural way to classify that is to look at when the pure machine intelligences exceed the augmented humans in aggregate intelligence/power/wealth. If it happens at significantly higher than baseline human level intelligence, then I'd classify that as IA first, otherwise I'd classify it as upload or code first depending on the nature of the machine intelligences. (And of course there will always be "too close to call" cases.)
Suppose we could look into the future of our Everett branch and pick out those sub-branches in which humanity and/or human/moral values have survived past the Singularity in some form. What would we see if we then went backwards in time and look at how that happened? Here's an attempt to answer that question, or in other words to enumerate the not completely disastrous Singularity scenarios that seem to have non-negligible probability. Note that the question I'm asking here is distinct from "In what direction should we try to nudge the future?" (which I think logically ought to come second).
Sorry if this is too cryptic or compressed. I'm writing this mostly for my own future reference, but perhaps it could be expanded more if there is interest. And of course I'd welcome any scenarios that may be missing from this list.