Which used tubed pre-amp & turntable for convert?

I am seriously considering going back to vinyl. Not happy with the system I have assembled:
Wadia 6 cd
Threshold T2 pre
Threshold T200 amp
Aerial 7B speakers
This combination sounds way too brite for my tastes. As the volume goes up it only gets worse. Everybody I have talked to or written to has suggested getting a tubed pre-amp. I also find myself wanting to try analog again (people who write about analog all sound so satisfied/fanatical even about their sound and I'm wondering if I am over digital). I listen to mostly rock (lots available on vinyl!). If I remove the T2 from my system, which used tubed preamp, phono stage and turntable would be good combination with the above? Phono stage could be in the pre-amp or seperate. Budget is $3000 to $4000. Where should most of the money go in this aquisition? I need some suggestions bad-my ears are bleeding!!!!