You have the words a little wrong, Jeri:

Diddle, diddle, dumpling, my son John,
Went to be with his stockings on,
One shoe off and one shoe on,
Diddle, diddle, dumpling, my son John.

There! I think that covers both your requests with just one verse.
-Joe Curmudgeon-