Regarding the ferrite beads. Is this what I'm looking for?
http://www.electrokit.com/en/ferrit-bl01rna62t5-murata-axiell-o3-6x5.43402
Yes that is what I am thinking about. These are effective at very high frequencies.
The other link shows a choke, that can slow down the current rise like the capacitors, you can use them both but the capacitor should do the job just as well as both.