I don't see how Superman is a match for Goku.
A) Striking power:
Goku is superior to Superman, not only because he is a martial artist but because:
1) Goku deals more damages to his opponents than Superman while remaining in base form.
2) Goku's opponents are far more powerful than Superman so is Goku.
3) Goku can amp-up easily with many Sayan transformations. Goku in his base form is already too much for Clark so I can't even imagine if he powers-up.
B) Combat speed:
It's easy via comparing the fights from the 23rnd Budokai tournament and understanding that Goku's speed improves in every story arc and with his Sayan transformations and techniques.
Goku is so fast in combat than Superman has literally 0% chances to touch him in combat.
C) Energy projection:
The best that pre-crisis Clark was to rise-up the temperature of the planet by a few degrees.
Goku can one-shot the Earth with a little Ki-ball.
The difference in power is tremendous.
On top of that the Ki-energy is the basic of Magic & the Quantum Field in the DC Universe AND is an opposing force to Superman powers:
That means that the Ki-energy will bypass Superman's invulnerability (ignore it) and counter Superman's pôwers (like a Red Sun) meaning that Goku can beat Superman just by powering-up.
Superman's maximum energy output must be similar than his New-52 version, meaning that he can at best do an all-out attack with a power inferior or equal to King Demon Piccolo.
D) Versatility:
Goku is now to invent new techniques and has a lot up his sleeve.
Superman can uses his powers in different ways but he has nothing that will come out of a threat for Goku.
Conlusion:
Goku is faster, more powerful and a better fighter than Clark. The only possible outcome in a fight between them is Goku giving to Superman the beating of his life without trying.