I just have to share this: I don't know if any of you have experienced this yet, but while I was trying to promote El Toro, he was defeated by Moofune. I wondered " Well what do I do now? Wait two hours or just try to finish and see what happens." So I continued the quest. El Toro did his task of trying to cut down the yum - yum tree and when it came to the battle with the swordman in Shujimura - he was REVIVED! But only for the battle, I had to put him on 'bed rest' again. And again for the last battle against Moosashi, he was revived!
So I got to say thanks KI for taking this into account and allowing us to finish the promotion with a defeated companion! And when I completed the quest he was again revived but this time to FULL health no more 'bed rest' needed!