Thrust,
I was able to dig up an old picture from one of my PS-520 rebuilds and indeed the stock primary filter caps have three leads, but like that thread you linked suggests the third lead at the "12 o'clock" position is for mounting stability...it may be a duplicate of the negative lead but it is not critical to the PCB because the "12 o'clock" leads on those 3 caps are not connected to any traces on the PCB. If you look at the PCB you'll see that those three lands are totally isolated. So you can just get regular old two-lead caps and install them as appropriate and you'll be fine, "-" to "-" and "+" to "+".