The ones I first heard sung at Motleigh Musicalia 1988 (plus or minus a year)were:
I'm waiting for the boatsman
I'm waiting for the boatsman
I'm waiting for the boatsman
Who will carry me away from here
Come along children (mothers, fathers) 3X
Don't you want to go

And we'll all go together
Yes, we'll all go together
To see my Lord Jesus walking on a cloud
With a rainbow 'round his shoulders

(Then you play the second B part again)
And yes, you can get that last line all in