Hard disagree on both accounts.
But first, how is Zabuza "barely" S-rank if he troubled an army unit led by Kakashi who himself is S-rank?
1603856885
Think about this:
The 5th Hokage, who knew of Uchiha powers, and Jiraiya, who knew of Akatsuki powers, thought that a team of 8 would be enough...