Hey-Hey!!!,
as an alternative to getting a new set of caps, one could perhaps parallel some of the smaller ones. Adding another 4700 uF or 6800 or 10,000 is not going to cause serious troubles. the diodes ( 1N5408 was mentioned ) are good for 5A delivered, or average...which is quite different from RMS values.DC delivered held constant, the bigger the first cap int he filter, the higher the RMS current will be. The current delivery keeps getting higher and shorter, hence RMS goes up.
regards,
Douglas