Yeah, I'd still give Luffy the edge in raw speed. He's crazy fast.
I'd also give him a significant edge in strength. Even Base Luffy was able to cause a small earthquake, collapse several buildings and punch Crocodile up through a few meters of pure bedrock with his goma goma no gatling gun. Adding Gear 2nd and 3rd plus Haki just makes it silly.
If this was OP time skip vs Naruto time skip, OP would win hands down simply because of how much stronger the characters got post time skip in OP compared to Naruto. Post time skip Naruto literally gained nothing after 2 years of training: he had no new moves and he still needed a shadow clone to use the Rasengan. That's actually really pathetic, if your not going to learn any new moves or get stronger, then at least master the one ****ing move you know. Luffy on the other hand not only doubled his strength, he got new moves, augmented his old moves, mastered Gear 2nd and 3rd and learned Haki. Pre-time skip it took the entire crew using all of their best moves to beat one Kuma bot, post-time skip, Luffy beat one with a single punch. That basically means that he's stronger then his entire pre-time skip crew. What did Naruto do after the time skip? Took a bell from Kakashi -_-
Anyway, I'm not entirely caught up on Naruto; I'm aware of Sage Mode, but not certain on his Fox Demon mode or whatever. But based on Sage mode at least, Luffy would destroy Naruto. Looking purely on stats, Luffy exceeds naruto in every respect (except intelligence, yet despite this, Luffy is a much more competent fighter). The big issue besides speed is defense: OP characters tend to take extreme amounts of damage without dying (Zoro in particular), Naruto characters on the other hand don't take nearly as much (Zoro would have just walked off the damage that killed Asuma). So really, one well placed move by Luffy would ruin a non-transformed Naruto (again, not certain about the fox form's defense), hell, he sent Hody flying through a mountain with just one kick, damage that would most likely kill anyone in Naruto's reality. Even with the fox form, Luffy has Haki enhanced Gear 3rd abilities, which are devastating. Elephant Gun alone should be enough to KO anything in Naruto, while Giant Gatling would be overkill (it nearly destroyed a ship the size of a city). Even if Naruto gets some damage in, Luffy can take it and hit back harder, Naruto would stand little chance in this fight.
Technically, I think Zoro has taken worse than that, like getting hit the stomach with a power drill. Also, he did get stabbed in the chest by Hawkeye in their first encounter, yet he was still able to defeat a fishman not too long afterwards.
As for the fox demon mode, given that the crew was able to defeat Oars, a giant demon zombie monster with Luffy's powers, PRE-TIME SKIP, I'm will to say that Luffy could beat a fox demon on his own post-time skip. Remember, post-time skip Luffy is stronger than his entire pre-time skip crew, so if they could beat something then, he can beat it alone now. Also, Luffy showed in the past that he can combined Gear 2nd and 3rd. Back then it hurt him, but based on how he uses Gear 2nd now (basically turning it on and off per attack) and the fact that Gear 3rd doesn't have any side effects anymore, it seems like he should be able to use Soru in Gear 3rd, thus giving him the speed and stopping power needed to beat any monster.