digital input CD/SACD player?

My current Yamaha I bought in '96 is developing problems and I think it's time to replace it. Eventually I want computer based storage so I'd like to know what people's thoughts are on a CD player with a nice DAC and digital inputs? SACD would be nice but I may be asking for too much. Would be looking to spend up to ~$2000 for a new one. Also, my Yamaha always seemed to be sensitive to disc imperfections as it skipped a lot. It must be the disc because it always skipped at the same place, but my cheap Discman never skipped that bad, and I take great care of my CDs. Is there a lot of difference amongst players today being able to read imperfect discs?

Thanks,

Eric