Calderwood set for Headingley return for Origin clash