I have significant amounts of arrows to fight them with.
My base tool bar is always:
pick, shovel, axe, sword, bow.. whatever else, water bucket, torches.
I very quickly switch from bow to sword if need be. also I sprint punt them tons. finally, our reach with tools and weapons has been increased. I can now swing at zombies and hit them long before they get into range to hit me. Iron swords work fine for me but from skilling up standpoint, diamond swords are better (damage too).
Two charged shots from the bow usually kills everything. One shot is enough if they've taken fall damage.