I'm voting for option #2, but I'm a sucker for the old-school looks. I've got a 1991 PDG Series 5 with 105sc downtube shifters. It took a little getting used to when I went back to that bike, but downtube shifters just look awesome.
__________________
"I feel like my world was classier before I found cyclocross."
- Mandi M.