Goku clearly states he could have beaten fat Buu, and Kid Buu(SSJ3 drained too much energy), Super Buu and beyond would give him trouble, but that's no peak Goku. It's only the highest point we see his combat abilities in. End Z Goku trains for another 7 years after the events of Buu.