Upgrading DAC from DacMagic?

My current home rig consists of a Marantz 5003 CD player feeding a DacMagic, and then on into a Woo WA6SE.  I listen with D7000s and HD800s, and also have a pair of LCD-2s on order.

My upgrade plans this coming year will be to add some type of music server to link with my iTunes library (all Apple lossless, on a MacBook), and possibly to upgrade my DAC.  I listen to jazz, classic rock, contemporary vocal, and some classical piano; quite a wide range of stuff, really.

I'll want something that can handle the Marantz CD player, as well as either USB from the computer, or possibly an input from a Squeezebox, or similar wireless device if I decide to go that route.  I may even purchase a dedicated iMac or Mac Mini, and re-rip my library to AIFF files, and connect that machine directly to whatever DAC I end up with.

My question is, what DACs, and at what price point, will be a noticeable step up from the DAC Magic?  I'm happy with the DAC Magic now, and feel that it is totally transparent, but I'm wondering if audible improvements would be possible with a higher end unit.

I've looked at the Bryston BDA-1, the newer Bel Canto 2.5, the Benchmark, the PS Audio DLIII, etc.  I'm hoping to be in the $1500 price range, but would go higher if there are significant improvements to be had with my other existing gear.

Any suggestions on DAC upgrades, or would I be better off spending in another area, such as a better universal disc player with a quality DAC built in, or a dedicated hardware music server?  I love the Woo tube sound, though, so the amp is going to stay for awhile. 

Thanks in advance for any opinions from anyone.

Thanks for all the replies and suggestions; I'm not familiar with the Cary or the Anedio, so I'll check those out; I have done some reading on the Wyred For Sound and the Bryston, and was kind of leaning toward the Bryston, but there are a lot of choices, and I've got plenty of time to shop.

I've been reading reviews on the Weiss DAC 2 as well, but it's quite a bit more than what I would want to spend right now.

Other suggestions are welcome.

Yes, the Audio GD Ref7 and other models are well spoken of on these forums.  I have looked at those as an option.

Other choices I've checked out are the Audio Note DAC kits; the 2.1 is single ended only, while the 3.1 can be ordered with a balanced output option; I don't run a balanced setup now,  but I may want to go that way in the future, possibly with a WA22.

I'm wondering if anyone here is using one of the Audio Note DACs with similar gear to mine.  I've done some DIY before, so I wouldn't mind the kit building.  

So far, though, if I was purchasing today, I think I'd get the Bryston.  Has anyone found the Bryston anywhere for less than the current $2150 retail?  

Has anyone had any experience with the SimAudio Moon 300D?  This unit seems to get great reviews, and is in the $1500-$1600 price range.   It has a smaller assortment of inputs, which I wouldn't need anyway.  I've ruled out the Cary Exciter, since it does not have balanced outputs, which I might want for future use.

I would need either a coax or toslink input from whatever disc player I will end up with, and a 2nd input from a computer, which will probably end up being a Mac Mini, so either way I wouldn't need to bother with USB.  

I've seen posts here from a couple of users that use a headless Mac Mini running iTunes, and being remotely controlled from an iPad.  Eventually (after the release of the iPad 2, hopefully in another couple of months) this is the way I would like to go, but I want to keep a disc player in the chain also.

My goal would be to have a disc player and a Mac Mini both feeding the DAC, which would then send the audio to my WA6SE, and on to my headphones.