Don't wast your money, keep the Yamaha until you have more cash. None of the stuff you are talking about is any better or at least not much better than the Yamaha. If your going to upgrade...Do it right and get much better. If your set on a tube pre, save your money untill you can get a good one. Nice amp by the way from what I've read!!
Dave
Dave