I agree with you. But due to the road conditions, it takes about 4.5 hours minimum to reach Bhavnagar from Baroda in a private car. Buses take more than 5 hours.
If travelling via sleeper train, its better to sleep for the time from Baroda to Bhavnagar, instead to changing the mode of transport.