A generalized π2-diffeomorphism finiteness theorem