Saved you both the trouble!
Bless you! But do you also know the
Diameter & Height info? (Lead Spacing is probably 2.5mm for all of them, perhaps 2.0mm.) The reason that Diameter & Height info is important is because of the required clearance. If I find a capacitor with the same capacitance and voltage rating, the size may be different from the original and it ultimately may not fit properly or at all. So if you have that information, could you please post it too?
On a semi-related note...
I found the following photo
HERE and modified it with a couple red arrows. What is the purpose of those two pieces contacting each other? Is it an electrical connection?
You can see the same thing in the following 3 photos of my GCC Hyperdrive here, except mind has a broken piece of blue plastic attached which I am curious about...