Yes opt for Raj if fare is not an issue for you. I would have chosen SDAH Raj as the arrival time is excellent, always arrives before 10 AM and staying awake till 2 AM to catch a train is okay for me. But Garba is okay too if you can comfortably stay awake till 3 AM. Not my preference though.