Thanks Jack. I can see I've got some relearning to do. Apart from getting the last two parts the wrong way round, I've got a few melodic elements mixed up as well.
As to key, as soon as you get away from piano accordions (discordions?) there are several versions in Am. I'll stick with Am and relearn the tune. Thanks again.