Ray has fixed and tupgraded two ICF-2010 radios for me and he is super.
I bought a used SW100S from Noel and he was great to deal with.
Either would be a great choice.

There are so many things to love about the ICF-2010, I don't think you
can go wrong fixing it. I use mine almost exclusively for AM/FM
broadcast listening, but it is nice to have the air and sw bands
available. It really shines in sw broadcast.

For ham listening, I prefer hf tranceivers or the Eton E1 or Drake
R8B.

My two cents plus a couple pennies too many.

Barry
WT7T