After a lot of suggestions on this forum, I ended up buying a Tern Uno. Thor gave me a great deal on a display bike, and my wife was awesome enough to get me a rack, pannier, and tail light for x-mass!
I changed out a few things: the saddle for a leather brooks that I had on another bike, the pedals for metal ones, and the weaker tern magnet for a dahon magnet. I also added an alloy Crane bell, spoke lights, and a NiteRider headlight with a custom switch (I post about that here). So here's how she looks: