He's found himself. Though domesticated, underneath still lies the genes and the instincts of a wild jungle foul. He's fierce warrior, a fighter, a defender of his hens. He has a sharp beak, talons, feet and muscular wings. His job is to battle and fight.
If you are to avoid rooster stew with him, you only have this present opportunity. Have on strong boots, army or hunting style heavy boots. A rooster primarily fights with his feet, so he understands boots as the superior warrior. Getting him to fear merely a broom or rake is not quite the same as fearing YOU. He must submit. He must see himself well below your status, or frankly? He isn't safe to have around. If you have kids or grandkids around, this is a recipe for serious injury and disfigurement.
Go after him. You should be the aggressor. No need to wait "til the next time". You initiate. Boot him right in the chest with a karate yell to scare the beejeebers out of him. If this is successful, you'll perhaps need re-inforcement every now and then. But his behavior gets worse or you still distrust him, for heaven's sake, stew him with spices, onions and carrots. He cannot stay. It is a back yard farmer's responsibility similar to those who keep aggressive dogs.