Improved Modelling of Spherical-Wave AVO