I tend to agree with John. Your real problem is the Linn. You can still sell it for good $. Get yourself something less bouncy, and you will indeed have an improved sound as well (just ask rollo now that he's replaced his Linn).
Problem solved, you get new stuff to research, buy and play with, WAF is satisfied.