This episode was better in some respects... but the music placing in the scene where Goku returns... yeah. I sort of see where they're going with this. Actually it kind of reminds me of the Gokuden super nintendo games, especially 2 when Goku returns at the Tenkaichi Budokai. It's also an upbeat theme with that reunion. Except in a game that works, but here... it kind of misses the point entirely.
Also all of these episodes could do with at least 1 more minute of footage. Every time in every scene they cut it just a little too fast. It's not by much, but there's almost no breathing time. If they cut the whole punching machine thing from this episode, the editing would've been great, I'm sure of it. Now it's just... okay-ish :p
Also always remember that if something is edited well, you don't notice it. If you notice it, someone is not doing their job correctly (or probably in this case, is being forced to cram too much into an episode).
I am looking forward to next episode A LOT though :p Goten VS Trunks is a good fight that I really like :p Especially because all of the reactions

And it's the first Dragon Ball Kai Buu Arc fight!