3 week India itinerary.. any input is welcome!

Hi all,

I am making my second trip to India in March / April and after much research I think my itinerary is finalised, so if anyone has any last minute suggestions please let me have them. Last time we did a Delhi, Agra, Rajasthan and Mumbai trip but missed out Fatehpur Sikri and Jaisalmer due to illness so with that in mind my trip is as follows

Day 1: arrive Delhi in the late evening
Day 2: day in Delhi, revisit out favourite bit about Delhi - Safdarjang Tomb, picnic in Lodi Gardens, Humayans - in the evening visit Qitab Minar and Lotus Temple (missed both last time)
Day 3: train to Mathura - rest of afternoon in Mathura
Day 4: up to Vrindavan for the day... I'd like to enjoy a boat back down to Mathura.... anyone have any experience of this or know whether it is possible?
Day 5: Mathura (today will be 27 March or Holi Festival!)
Day 6: train to Agra - hire a rickshaw driver for the day to visit all main central Agra sites, plus hopefully get full moon tickets for Taj Mahal... is this worth doing?
Day 7: Fatehpur Sikri - stop at Akbars Mausoleum on the way back
Day 8: train to Ranthambhore - afternoon safari
Day 9: day taken up with safari and fort visit - if we get that superb tiger shot, maybe take a trip out to other reserves for the scenery
Day 10: in the afternoon take the train to Jodhpur
Day 11: revisit out favourite parts of Jodhpur - fort (maybe do flying fox this time), Jaswant Thada and Mandore Gardens. Take the sleeper to Jaisalmer
Day 12: arrive Jaisalmer, explore
Day 13: in afternoon partake in an overnight desert trip
Day 14: return from trip, rest of day in Jaisalmer
Day 15: train to Bikaner
Day 16: day in Bikaner / Deshok Temple - get the very late sleeper train to...
Day 17: Makhu, where we will then get a bus to Amritsar
Day 18: Amritsar
Day 19: series of trains to get to Shimla - Amritsar - Chandigarh - Kalkka - Shimla
Day 20: Day in Shimla
Day 21: hire a driver to visit some of the outlying villages... I'm open to suggestions here, my only specification is I want to enjoy breathtaking scenery!
Day 22: trains down to Delhi
Day 23: leave India

I'm hoping to get 2 days extra off work.... just 2 days I know but it will then make me consider either: going from Amritsar to McLeod Ganj then onto Shimla then down to Delhi - or getting over to Hardiwar - or just chilling somewhere!

Open to suggestions and thoughts. As well as things to do in the places I plan to visit which usually get missed out!