I am sure Sabu will soon be fed up with us (if he isn't already) changing our minds over the India itinerary. Yesterday I thought it might be better to fly from delhi to Jaisalmer rather than the overnight train, as it would allow us more time for sightseeing in Jaisalmer. As well as a night in a proper bed the first night in India. Unfortunately there are no flights from Delhi to Jaislamer that day, so we have to fly to Jodhpur and pick up the car and driver there before continuing to Jaisalmer. It still sounds a better option though.
The hotel Nachana Haveli sounds awesome. Built by royalty and run by royalty, it's a 300-year old mansion.