A new definition of the diffractive limit with applications to pp and pp scattering