You might want to consider an iMac (just rip your cd purchases to the drive ) and an iPhone. The latter provides a great wireless interface and the former is (IMHO) a very good transport. Total cost should be around $2K and you certainly get a lot of functionality (as well as performance) for your dollar.
Good Luck
Marty
Good Luck
Marty