Since Spain is not going to stop this torturous entertainment, the rules and methods should change. I believe that if you are willing to take on an animal just to prove you are brave and manly then the fight should be fair.
Matadors should be allowed two weapons such as what they have. No material flags should be used to distract the bulls. No obstacles should be placed in the ring either. There should be a time limit. If they can still take down the bull, it should be done with efficiency. If they cannot kill the bull, then the bull will be set free on a farm to live it's life.