Vinyl easily.
CDs instantly remove a lot of bass and also a lot of high end frequencies. Also if you are using MP3s on the CD then the sound fucking sucks really, compressed audio - no thank you.
Stick to vinyl - not compressed at all, sounds so warm. I dunno what it is about vinyl but its great
I was told that you couldn't get psytrance on vinyl?
I hope you can, I would love to start mixing it