That is basically what I was saying. Something more along the lines of Goku during Dragonball, like when he was fighting the Red Ribbon Army or even when he fought King Piccolo. Something like that.

...I kind of want to dig out my old Dragonball volumes and read them again now, ahah. XD