I still think he'll have more value on another team than on the Cs.
Put him on CLE, OKC or GSW where he can play with a big, ball-dominant backcourt partner and play 25 mpg, where his sole focus is harrassing the %#?! out of the opponent's best guard while giving someone like Kyrie or Steph a break from exerting too much defensive effort.
I think he'd be incredibly valuable in that role. Being in the Finals you're probably playing against Irving, Paul, Curry, Westbrook or someone of that ilk. Putting a stopper on them for half the game could be the difference in the series.