Not been to Amritsar but my parents were there in April. Expect loads of crowds at the Wagah Border Crossing, but according to their experience- and relating it to my experience from other places- the pushing is lower at the male stand than the female one.
Delhi is my hometown and I like it a lot- modern as well as traditional. Don't forget to venture in to New Delhi- colonial architecture, clean streets, India gate and some nice areas.
Don't hesitate to ask me about Bangalore- I'll try my best to help!
Otherwise, I'm not too good with the itinerary posts- I'm sure everyone's advice would be useful.
So, several weeks ago I spent two nights and three days in Pondicherry...a very good experience. I stayed in a lovely old Colonial house on the top floor with amazing views over the town and with the sound of chanting starting every morning around dawn. We strolled along the Promenade every evening/night enjoying the crowds and admiring the beautiful people (jasmine in hair, lovely sarees). I didn't hear any French being spoken. Of course we went to the Sri Aurobindo ashram but only for half an hour since these days you are guided in and out fairly quickly with the emphasis on the 'out'.