It's closer. I still say Goku takes it. There was no mention of Gohan having the advantage against power weighted Cell only because of Speed. Trunks babbles about Cell using the form, but it doesn't seem to apply to what is going on imo. Gohan had an enormous amount of power to spare, enough so that I think Goku, using the same form, would still have the advantage.