If U dont mind to change ur train then u can book newly introduced 19409 ADI GKP Express from adi, but you to book asap otherwise u may also loose this chance as well. catch Gujrat Queen from Surat it will safe in my opinion.
The above suggestion is only if u feel comfortable by changing Train.
Regards.