Probably Goku. If Vegeta had gained the increased durability that we saw from Spopovitch I'd go with him, but Goku has a slightly better arsenal of techniques.
Goku's got the better skillset, but wouldn't put it past him to abandon strategy in favour of a brawl due to the love of battle. Going with Goku, but it'd be close.
For what it's worth, in the anime fight, Vegeta fared better. I think to Vegeta that battle was his lifelong goal, whereas for Goku (even with no distractions), it was just another fight. So Vegeta would have most likely won.