NBA: Westbrook return to see OKC edge Heat-Thunder clash