I realized that comparing machines with augmented humans on an individual level doesn't make much sense, and edited in "in aggregate intelligence/power/wealth", but apparently after you already started your reply. Does the new version seem more reasonable?
As I see it, your proposed classification scheme perpetuates the notion that Intelligence augmentation and machine intelligence are alternatives to each other. If you see them as complementary, using the distinction between them as the basis of a classification scheme makes little sense. They are complementary - and are not really alternatives.
Yes, it would be fun if there was some kind of viable intelligence augmentation-only way forwards - but that idea just seems delusional to me. There's no such path. Convergence means nanotech and robotics converge. It also means that intelligence augmentation and machine intelligence converge.
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.