If you decide to rip your music to your PC you should consider the Modwright Transporter. It has ended my search for a better CD player or DAC. The CD players and DAC's I have owned are, Wadia 20 transport and 27ix DAC, Wadia 861SE, Rega Saturn, PS Audio DLIII (with my iMac as the source) and the Proceed PDT3 and PDP3.
In my opinion, in my system, the Modwright is better than all of those players/DAC's. I have ripped over 18,000 songs using Apple Lossless to my iMac and the Transporter's convenience and sound quality have been a revelation to me. It even gives my vinyl rig a run for the money. YMMV