That is probably the best way to organize the stops.

There is a train from Agra to Delhi but that is not something I would recommend unless you have travelled the train system in India.

There is also this http://palaceonwheels.com/new/home.htm if you can fit it in your budget.

Good luck and have fun...but I insist on visitng Jaipur and seeing "Jantar Mantar'