Thanks guys. Yeah, after screwing around with a lot of capacitors I concluded it just wasn't worth the money and effort.
The diodes do a fine job and only require a little bit of extra resistance to get the current right on the money.
The CL-90 provides a soft power up. It may look smaller than CL-90s you seen before. The effect is that it warms up and cools off faster because there is less mass. Also makes it easier to fit inside. I put it up top along with the resistors to keep heat away from the diodes.
Here's the compacted version that easily fits inside the metal housing.
