Thinking about who might be available, I'd look at either Paul George or Mikal Bridges.

They both offer the same kind of floor-stretching on offense (minus the offensive fouls) and they're good defenders as well.