One thing that just crossed my mind and I thought I might add to the general advice here...
I think once you pick a weapon, you'd best stick to it. My Rooster is currently very well behaved with me; he doesn't threaten and if I walk toward him, he'll walk -- and then run! -- away. BUT rooster-minds are not difficult to read, and I've seen him contemplating what might happen if he just... you know... kinda walked over to me and looked a little... well, threatening, maybe. Maybe lounged up against the lamp post on the corner in a leather jacked and lit a cigarette, that sort of thing.
When I see that, I reach for the litter scoop, my weapon of choice.
He immediately goes to whistling and staring off into the distance. I get the idea that he thinks I'm a rooster who can take my "spurs" (the scoop) off, but he definitely recognizes the object and responds to it.