I had to put my 1M aside, as it needs so much work and I have so little time. Glad to see you're sticking with it. I'm finding those gray ECCOM caps are pretty bad. I pulled few (7 total) from mine in random spots to check them. Every single one was pretty well out-of-spec. That's when I decided I'd come back to it in the Spring.
Yup - I plan on doing a wholesale re-cap. I know a lot of guys frown upon a full re-cap, but if they're all bad, they're bad and they ain't coming back to life.
Would you mind posting a detailed pic of the power switch, if you have the front open? The wrong switch is installed in mine and I'm lucky it didn't burn the house down. I can't find a part number for it and I'm hellbent on getting it sorted sooner or later.