Something like this.
I don't like seeing the end of life symbol to so many panasonic capacitors though.
Those could work, but the mounting hole looks a bit too big. A spade terminal crimped and soldered to the snap-pins would
A. Extend the leads like in the originals
B. Provide two prongs per lead like in the originals.
C. Might even be on hand or locally sourced and not need a special order.
As to the end of life, Panasonic will just be discontinuing production of that series (I think in 2015), so for new designs you wouldn't select them as a major manufacturer. The caps themselves will be fine, and by the time they would next need replacement, none of the current offerings will likely be in production anyway.
I didn't look at the datasheet for the 4 pin versions recently linked, but typically, two of the four pins are just for mechanical stability in circuit boards, and not electrically attached. Since these are going to be clamp mounted, the extra two pins on each cap would just get in the way of the wiring and need to be snipped or bent out of the way.
Edit: looking at the datasheet, on the 4pin version, the extra two are indeed just for mechanical stability. They do make a 5pin version in which there are 2(+) and 2(-) pins, plus one extra non-connected pin for mechanical stability.