We knew the return of Hip-Hop Honors after a six-year hiatus would be huge, but with a surprise from Diddy and some major beef getting squashed, this year was bigger than ever.…