help me settle on a source...

hi. i currently have a pair of sennheiser hd650s with the zu mobius cable on the way. amp for the phones will likely be either the gilmore gs-1 or emmeline hr-2. my musical preferences are anything indie, and classic rock/funk/soul/r&b/doo wop/jazz. my max budget right now for a source is $1200 US. this will hopefully cover an upgraded power cable, as well as extra shipping/taxes i'll get hit with since i live in canada.

right now i'm torn between the rega planet 2000, and getting the level 3 modded music hall cd25 from soundodyssey.com. the major upgrades of this player being the trichord research clock 4 and the zap filter. how do you think these two players would compare to one another (ie. are the upgrades for the cd25 worth the extra coin)? do any of you guys have experience with the modded cd25? have you any other suggestions for sources i might want to look at within my price range (keeping in mind i live in canada, my musical tastes, that for now it'll be used exclusively for headphones, and i don't really want to have to wait around for a good deal on a particular player to come around...i'd like to buy my source within the week since my phones will be here any day now). thanks!