Don't go for a 2.0D. It still comes with an engine from prehistoric times, when the primitive man discovered diesel :P.
Well, on a serious note, the 2.0D has 20 year old engine in it, which will become a smoke machine in hardly 2 years. The XLi comes with a 2NZ-FE and VVT-i this time (another fancy name for the same technology as in VTech). I've had a ride in both, the new XLi and the new 2.0D, and the XLi was far better.