Trust me, watch it in japanese, even though your memories are the dubbed version. They were mine too. There's actually like three or four entire episodes that were cut out of the dubbed version... the most important being the final two episodes that were cut into one.
Once you get used to the japanese voices, you'll hear the eng dub and be like "wtf?"