We can scale like this:
Choji is strong enough to fight Gedo Mazo.
Gedo Mazo is strong enough to kill Hanzo. If it wasn't so, Nagato wouldn't have called Gedo Mazo when he wanted to kill Hanzo.
Hanzo is strong enough to put Jiraiya into sage mode.
Chiyo is relative to Hanzo.
Gamabunta is strong enough to fight Shukaku.
Gamabunta and Manda are relative, and Manda is capable of killing the armless Orochimaru.
Pain>It is certain that it was Deidara and Base Kisame, and Deidara defeated the 3-tails and Base Kisame defeated the 4-tails' Jinchiuuriki. Of course, Kisame may have switched to his Fused form off-screen, but we don't know.
I don't know how to make an upgrade based on this information. The idea of choosing Sage mode>Butterfly mode and getting it as a Sage mode 100x amp came to my mind, but I know that there is no such thing as one form that is more powerful than another form and that it will give as much power. More precisely, there is no rule that says every form must be multiple.