Extended Gutzwiller wave function for the Hubbard-Holstein model