Effects of drift on the transport of cosmic rays. VI - A three-dimensional model including diffusion