Glen,
I modded my std RA23 tank (by a fuel tank certified/approved shop) by cutting out a square section of the tank directly below the fuel pick-up, and then on the inside of that square section, weld in a circular maze style baffle so that when welded back in, it sits around the pick-up sock nicely. No surge even when down to 'E' on the gauge.
Cheers,
Mitch.