I disagree with your assessment on Daredevil.
The range advantage doesn't really mean a whole lot against Matt. He consistently goes up against foes wielding guns, machine guns, and even arrows on a regular basis. Arrows in particular are actually a cakewalk for Matt and comparable characters to catch, dodge, and deflect as they've done all three.
All that is to say that Matt won't have much trouble closing the distance and taking the fight to CQC range where he thrives.
As for being able to discern which arrow is which, I think that won't be much of an issue either. Matt will be able to tell by the smell of the arrow's components. So he'll probably be able to tell which arrow contains explosives, for example.
His senses in general will be a massive advantage, as he can use them to predict attacks and behavior before they occur by listening to heartbeats, sounds of bones shifting, breathing patterns, etc. So catching him off guard is next to impossible, especially because the range of his senses is massive. He can hear things happening very clearly from multiple blocks away.
As for skill, I really don't think Oliver will hold any advantage there either. Matt has been training since he was a child, and has mastered many forms of armed and unarmed combat under stick including, but not limited to, boxing, Muay Thai, Judo, Tae Kwon Do, Wrestling, Silat, Kung Fu, Wushu, Kali, and more.
He has a great deal of experience fighting extremely skilled ninjas, and has been praised for his skills by people like Elektra, Stick, Iron Fist, Nobu, and Bakuto, all of whom are extremely skilled martial artists that Matt has bested at one point or another.
He also has an immense amount of pain tolerance, which allows him to keep fighting for hours with grievous life-threatening injuries. Additionally, he's a master acrobat, and has great parkour and evasive skills.
Ultimately I think a combination of Matt's sensory capabilities, skill, and indomitable will should net him the win here.
