I want to say Skarmory, but Staraptor is just cooler and can kill Skarmory witha quick Close Combat.
Calcs beg to differ :P
Using standard spiking set with Skarmory, against a Choice banded +natured 252 attack EV'd Staraptor, Close Combat does max 43%, and fails to 2HKO even with Stealth Rock up and going.
To make matters worse, Skarmory can simply Roost off the damage, and doesn't necessarily have to stall him out of CC's meager 5 or 8 PP.
(And Skarmory is slower than Staraptor, so it can Roost without fear of being hit with a SE Close Combat)
558 Atk vs 396 Def & 334 HP (120 Base Power): (36.53% - 43.11%)
Since Skarmory is slower and CC has some very unwelcome defence drops, after two hits from CC, Skarmory will completely demolish Staraptor with a STAB Brave Bird:
212 Atk vs 88 Def & 312 HP (120 Base Power): (99.36% - 117.31%)
This is assuming Staraptor isn't intimidating Skarmory, but if it did, then you'd just have to stall it out for another round :D
Gentlemen, Skarmory is the winner, w/o a doubt.