I actually found the bartender to be kind of disturbingly Magical Negro in an otherwise fairly evolved show, but I agree with most of your other points.

I never did love Gene Hunt, but I appreciated the character as a great foil for Sam and a sort of personal representation of his culture shock. And yeah, if things got ugly I'd want to be behind him.

Annie is 100% awesome.