Regarding classic Thor, I believe he was third in line as strongest being in Marvel, behind Hulk and Thing...unless that's too "classic."
As for his upgrades...
Why can Thor do some of the things he can do? Where is the relevance? What do "dimensional portals," for example, have to do with controlling the weather? He's a thunder god, not a spacetime god.
Magic would definitely give Thor an edge (if he used it, which typically he does not), but it would not be enough to counter all of Superman's advantages, speed being one.