+1 what @lou_setriodes says. Both Stereophile and Absolute Sound said TF-10 was one of the best pre's in existence at the time and used is well w/in your budget. I've only heard the amp but would imagine David designed pre and amp to be magical together...
Also, just b/c CJ couldn't figure it out 30 years ago doesn't mean they still can't. Have you talked to them recently about it? But seriously, you've been experiencing this problem for 30 years? Wow--patience of Job or that CJ is really something when it's working...

