An Improved Model for the Dynamical Evolution of Dark Matter Subhaloes