Now i dont know a lot about roosters but try this:
When ever he starts puffing up, you do the same and look him in the eyes. And he might back off.
Another thing might be squirting him with a water gun or squirt bottle when he charges.
I dont know a hole lot but i hope this helps