I've always been enamored of the Bose Wave, but the lack of buttons and (sound) controls put me off (as did the price). Didn't the first version Wave have buttons on the top? (ah, yep.)
I went looking on CraigsList and found several of the AM/FM as well as CD variety. Reviews on Amazon put me off again, though.
Then I went on a tack of Cambridge Soundworks, Tivoli, and Boston Acoustics. Read a ton of Amazon reviews last night.
Sort of narrowed it down to
Cambridge SoundWorks - SoundWorks Radio 720 with iPod Dock - Onyx
and
iHome iP90 Dual Alarm Clock Radio with AM/FM Presets and Dock for iPod and iPhone (Black)
Neither were completely satisfying, but also not a bad upgrade from crap. I don't own an iPod, though, so the iPod dockiness isn't a requirement. I suppose I could join the rest of the world and get one off CL if I wanted yet another layer of complication.