How Many Angels Fought?

S 8:9 When you ask your lord for help and he responded to you: I am aiding you with 1,000 of the angels one after the other.

S 3:124 When you say to the believers: Will it not be sufficient for you that your lord aids you with 3,000 of the angels sent down?

S 3:125 Yes, if you are patient and fear and they come to you immediately, this your lord aids you with 5,000 of the angels marked.

The first verse refers to the Battle of Badr. We are told that 1,000 angels were sent. There is some scholarly dispute as to whether the last verses refer to the Battle of Badr or of Uhud. If the latter, was the number 3,000 or 5,000?