Well, I can tell you what I do with mine when they get testy.
When she comes at you grab her around her neck, just behind her head with your dominate hand (when better if this is the one hurt) - do not squeeze even if tempted (can be very hard not to) and just hang on. Mine will back up, and I generally back up with them, holding their head, glaring at them and telling them I do not appreciate their actions.
Once in the last three years, I had a gander come at me during breeding season. When I grabbed him by the neck like above, he started in with his wings. I used my head hold on him to turn him around and with my other hand grabbed his body and lifted him up. He has not tried the wing thing since.
If Chubby continues with a nasty attitude, then I would pick A.