Extended Goldstone-boson-exchange constituent-quark model