Goten said facing Mr. Buu was unfair, so with or without DBS retcons, base Goten is far from Mr. Buu's power.
Piccolo keeps training and he's at least Buu Saga Goten's rival if not quite superior before the end of Z time skip. With 10 years more training regardless of DBS retcons I say Piccolo wins.