[G6Tanuki]

Yes, swap out anything Hunts; the grey plastic capacitor at rhe top of your photo and the black one at the bottom I would consider suspicious irrespective of manufacturer.

I've got an 840A s my bedside-radio [I'm an insomniac and listening to Radio China's strange rants lulls me to sleep] - the one thing to watch out for in these radios is small deeply-embedded capacitors used to decouple the AGC line: they're about 3/4 inch long, wire-ended, brown, round-ended - hence the colloquial nickname "Rat-droppings". They go leaky and the last thing you really want is a couple of capacitors-pretending-to-be-1-Megohm-resistors shunting the AGC-line to ground.

Also, bearing in mind that it's an AC/DC radio, check the low-value capacitor wired in parallel to the rectifier; if this has gone open-circuit it can cause horrible issues with 'modulation hum' when listening to double-sideband-full-carrier AM stations. Replace with a modern 1Kv-rated 0.01uF ceramic....