Towards Surface Leakage Free High Fill-Factor Extended Wavelength InGaAs Focal-Plane Arrays