Extending the velocity-dependent one-scale string evolution model