Barnes set for Waratahs return