I would try first the software filtering as I described to you.

Last resort to capacitors. If something changes, then you would remove old caps and put new, larger or smaller???

Ioannis