pre time skip dies
current law should win but not easily.
We haven't seen what a current Magellan can do, as he has seemed to change the last time we saw him appear(which as One Piece goes, if you change how you look it means you've progressed lol). However, Impel Down Arc Magellan was still able to take on a second-gear Luffy and should have won if that wax guy wasn't there lol, so he certainly has the stats to compete. I give it to Magellan 6/10.
However, I do love Magellan...