Numerical calculation of energy deposition by high-energy electron beams: III-B. Improvements to the 6D phase space evolution model