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!!!!
nomad
I can't speak for the Wadia or the Aerials, but the Threshold gear is not bright. I have a T2 and it is the best line stage I ever owned. It replaced a Levinson 380S (that it totally crushed). Your problems are somewhere else in the system. The problem may be the listening room or your cables or any other number of things. I feel you would be making a mistake removing the T2 from your system.

PS. Most rock music is not recorded very well and that may be where some of the brightness is coming from.
If you want a really nice tube preamp with a killer built in phono stage then look for a used Conrad Johnson PV-9a.
Preamp-MFA Luminescence- has killer phono stage.
TT- VPI 19Mk.III or higher with something other than
the cheap Rega or ET arms.
Buy a new medium output MC.
Stay away from used Linn LP12s,unless you
see and hear it first.