Yes, Nichicon would give you most bang for your buck. Also, Sprague Atom for critical small values such as in bias circuit. JJ multi-can capacitors are great value, too.
Been using all of the above for the past 12+ years and no issues at all.
If I'm recapping a solid state circuit, I'd use Wima film caps.