An improved description of hadronization in the QCD cluster model for e+e− annihilation