Those are the ones, yes! I didn't know there was a dub before the Disney one; I only know that the songs on the DVD were different than the ones I grew up with, and as appropriate and authentic as the original Japanese songs are, I both really like and miss the ones from my childhood.

socchan (at) protonmail (dot) com, if you can find the tracks! ♥