Honestly this won't be popular but I'd gladly take this commitment and move on from Rawle. Looks like Rawle wants to drag things out and him and Heron are pretty much the same player to me just lefty and righty versions.
As of right now we will lose Chris, Sheed (likely), Ron, and maybe more depending on other additions so 3 focuses on 16 IMO should be a PG and big man in addition to Heron.