[Test-Equipment] Signal Gen question

[Ron Bussiere via Test-Equipment]

Hi. I have a ton of SGs. I have a pretty nice HP 8640B but I've grown disenchanted with it's mechanics.
I have a spare set of the 'infamous' nylon gears, Manual, VLF converter, etc. Recently, I moved the fragile AM/FM switch, which snapped.
I took it apart thinking I could 'fix' it.
Once I realized it was inaccessible, I reassembled it and now the display flashes. That was it for me.
I want to replace it with a more modern, (less moving parts) model.

I'm torn between  the following HP models:

8656
8657

Any suggestions???

My medium frequency bench, has a nice old, HP 606A. Built like a tank, when used with a counter, it's great. Only 50 MHz, though....
I also have all of the 608 models.......

ron
N4UE