I wouldn't advise replacing the capacitors with those TDK capacitors for the following reasons.
They list typical ESR, not maximum ESR. Also if you look at ripple current, it's 2.79A at 100Hz and 105oC which is only slightly better than 2.47A of original. What they are certainly good at is...