Doing the wing dance at you is not yet a problem but can become one - he's treating you like one of his hens rather than respecting your space. He should see you as above him, not beneath. Generally unless I'm doling out treats, the rooster should keep a wide berth around me, move out of my way if I walk towards him, and submit if I pick him up. He should not be trying to impress me with his wing dance! Sometimes I toss random objects in his general direction to keep him off balance - pine cones, sticks, leaves, anything I have to hand - not to hit anything, just to spook him. I remember as a kid the story of Chicken Little seemed silly... until I started raising chickens. 
