Optimizing primordial non-Gaussianity measurements from galaxy surveys