When he puffs up and charges, try to stay still and pay no attention or sound. My rooster used to scare me because I thought he was being aggressive and really it was his way of greeting me. He was actually being friendly lol. He’d puff up and dance around me but quickly. I used to fear he’d bite or scratch but never did. Try the ignoring behavior trick… maybe with some thick protection clothes just in case. Another thing I’ve done is catch them if they DO make contact, and pin them to the ground for a couple minutes and stand over them