Watson on track for return to one-day side