As Ace pointed out he absolutely was our best player in the Orlando series, and a bad matchup against the Heat doesn't change that.
I do agree with you that a 6th man role seems to be where he fits best on the team going forward.