Yes, you are absolutely correct. Also as per @gt1092 Mumbai Rajdhani should stop in Gwalior rather than in Jhansi as per Citi's population. But, it will have to again take a technical halt in Jhansi for Crew change and other stuff.
Its better to remove halt from AGRA Cant and provide a halt in Gwalior.
In fact, Agra is near to Mathura, so Agra people should prefer 12954, august kranti rajdhani to travel towards Mumbai. This will save their time too.