CD
At this point, I would pick CD, for various reasons.
1) While very good vinyl sounds VERY good, it is also VERY VERY expensive. Replacing good needles/cartidges frequently can be expensive.
2) CD technology has gotten alot better, both in the recordings, and the playback. They have also gotten cheaper. Medium priced($2K-$3K) players of today sound better than State of the Art players from 5 or so years ago. CDs themselves have gotten better-audtion some of the newer XRCDs and see for yourself.
3) direct comparisons between the two media are frequently futile, since more often than not, they are different mixes.
4) As previously stated, most new vinyl, is digitally recorded, and IMO they tend to sound it. I have some LPs, that sound more "digital" than most of my CDs.
5) While bad CDs can sound bad, I have some very early CDs that sound much better than I would have guessed on the newer CDPs.
6) really bad vinyl sounds really bad-as bad as bad digital, but in a different way.
Just my 2 cents,
Jack
PS. I still play vinyl, but its usually stuff that didn't make it to CD.