Gill set to return; Kishan in the race