Where in California are you based? I may be able to make a recommendation in the SF Bay Area. Also curious as to what is the problem with the amp, I have one too. Another option is to contact www.audiohigh.com a MF dealer in Mt. View, CA, they may have a recommendation.
Andy
Andy