Well, we just bought a 2.0D last week. Cars are available readily, so there is no waiting period (at least for the 2.0D).
I suggest you should go for a GLi (although I am a 2.0D wala :P). It has a lot more goodies. You'll have an option to choose what colour you want (big deal for Indus Motors! :P). It'll have ABS, rear speakers, central locking, and power windows which the 2.0D won't have. The 2.0D comes with an ancient diesel engine, which by the way, is not that bad, but the new 1.3 that comes with a GLi is much better in my opinion. On the downside, the XLi and GLi do seem to be a bit underpowered (but you won't be racing, would you?). In terms of torque, the 2.0D is obviously better.
This was my opinion. At the end of the day, it's your car, your choice :D.