Pion form factors with improved infrared factorization