-Thor
-WW
-Thor
-Eh, probably a split. Diana has more finesse and style, Thor can deal out more raw punishment and take more, which I think is important to the overall aspect of fighting skill. Diana's probably the safer bet, though.
1. Wondy
2. Wondy
3. Probably Wonder Woman, but I can kind of see how Thor is getting votes. Mjolnir and all. But we've just seen Diana pick up weapons we've never seen her use before and still wreck everybody... many times. She's got way more weapons training overall. Even if we just count standard equipment, she doesn't quite have the luxury of being able to mentally command her shit when she screws up, which is never. It reckon it's a LOT harder to manipulate the lasso as fast as she does than it is to throw a hammer and then tell it where to go and when to come back. Diana does that with her tiara, but she doesn't mentally call out to hit; it's shape and her skill direct the flight path.
This.
On striking I'd actually put them at about equal but Thor can strike with more force. Also Thor is better with weapons IMO and at his strength all weapons regardless of weight and handling will handle the same for the most part excluding reach because even with Mjolnir being a warhammer someone of thor's strength can wave it around like a sword as the momentum in the head of the hammer is almost negligible to his strength so IMO any weapon he picks up in a straight hand to hand weapons fight will be with just as much skill as Mjolnir barring spears and range weapons but I'm sure daddy Odin has given him stabbing lessons with his spear. Overall I'd say WW is the better fighter but would lose in a fight on durability and raw strength as well as energy projection capabilities to Thor. She suffers versatility the same way supe's does. Though her bracelets definitely negate a lot of the energy projection I just don't think that her gear is enough to secure a majority against Thor in a straight fight so
Grappling- WW- undisputed
Striking- Thor- due to strength
Weapons- Thor with stips of hammer vs sword
overall- WW is the better fighter but I don't think she would win in a fight due to versatility and raw strength and durability on Thor.