I think you're right, Snuffy, on all counts. Especially the less downbeat chorus end. I'm going to think a bit more about the alternate line, though. Yours doesn't quite make it work for me. It's basically what happens when you write things in pieces, and one bit comes to you before the others.
Blessings,
Barbara