Elsom set for Waratahs return