For being owned by Comcast/NBC/Universal, it is surprising that there are little to no stationary references throughout the entertainment district of the fact aside from the name obviously being plastered everywhere. So I would be in favor of an NBC Store or better yet, and change NBA City to an NBC Sports Grille, with adjacent shopping/entertainment. Also, I don't believe Uni has a comedy club anywhere on site. Could a section of the building be relegated to make a SNL/improv style venue?
A memorabilia store also sounds nice.