You can run the stock tank or the one you are making with a surge tank set-up and you'd never get cavitation in your fuel system again.

The system would use Holley Hydromat with an in-tank pump that's connected to a surge tank with an equal sized return back to the tank. The fuel will then circulate at near zero psi, but at high volume. Alone you can still get cavitation as you have been experiencing it, but the air bubbles are quickly returned to the tank from the surge tank itself.

Your main fuel pump then goes into the bottom of the surge tank, up to the motor where it bypasses at the pressure regulator what is not used and sends it back to the surge tank.

This system eliminates virtually all air from the fuel system even when you are down to the last gallon of fuel. Works for EFI & carburated fuel systems. I run the low pressure side through two, high volume water traps/filters.