Glad to see you got it working (sort of)! Once you get the picture flipped right side up, it looks like you're home free. For your next restoration, take a look at Phil's capacitor replacing page.
http://antiqueradio.org/recap.htm
Towards the bottom, it shows how to restuff an electrolytic can. It takes a little more work, but it's a tidy method. I usually cut the old can open with a pipe cutter and dig the guts out. Then, I just use radial lead electrolytics (the smallest diameter available), drill holes at the bottom of the can for the leads, and put the whole can back in.
Sorry I'm a little late getting to the thread.