Yeah, Jinbe should be much higher if we're going this route.
Like, do we really believe Jinbe, who is nearly invincible in his element and can destroy ships from underwater, is weaker and lessof a threat than Crocodile? At this rate, only Moria should have under a billion.