Realistic Electron Diffusion Rates and Lifetimes Due to Scattering by Electron Holes