See, to me, it would just seem like the most obvious thing to do is consider the entire thing the character's encounter with the archery target / in the archery competition.
So, if the elf can reroll a ranged attack, and has a feat to add +2 to that reroll, and all of that is per encounter, he...