Ken,
Here's your wiring diagram, the way you described it is the same as the Featherweights, except for the light switch:
I believe you are correct on your wire positions.
If you can, you still need to read Rain's tutorial I posted the link to above. I tried, but I'm on a slow dial up and it like takes forever to download. Then I saved the pages and my STUPID ^*%#$%&$^%^%^*&%&((*^#$@ computer split the files apart so I have the pics, but now I can't access the bloody text. ARRRRGGHHH!!!!!
OK, I got that outta my system.
I think you got it handled.
Let us know how she works.
Joe