Dhawan takes back Orange Cap, Shaw rises to third