My new idea is to do a day trip to Agra and then to fly from Delhi to Jodhpur. We would then do a couple of days in Johdpur, a couple in Jaisalmer, a couple in Jaipur and then a couple at AmanBaugh before we head back to Delhi for our return home. Thus we would only do one overnight train going east.

All suggestions welcome.