Waller to return to Saints from Warriors at the end of the season