Orochimaru.
Kabuto only took some power from Oro's subjects to improve himself, and buffed Edo Tensei.
Orochimaru on the other hand made Sage Mode curse seals from Jugo, managed to know how to get his arms back, buffed Edo Tensei as well. Found Ryuuchi cave.