Did Luffy surpass Oden?

[SSJ2]

Oden is the only one to have "defeated" Kaido, though it's arguable that Kaido was somewhat weaker back then. Has Luffy surpassed Oden?

 

[Future Warrior]

In the same tier. But with the development in the recent chapter, Luffy is stronger.