Roy. Conner, even at his very best, was the clear third place in the archers.
When Merlyn the assassin showed up against Ollie, he said, "They say he's Conner good. Maybe even Roy good," emphasis mine (and he ended up not being that good).
Roy might even be a better shot than Ollie.
Conner > Roy in HtH, Roy > Conner with a bow or other ranged weapon.