Another possibility could be to replace the parts with cheap value matched equivalents.Drivers vary more than can be detected with matching caps.
Additionally, ALL of the PP & PS caps I've bought and tested in past few years far exceed their tolerance spec.