Skyclimber,
I still have an Audio Electronics Super Amp MkII that I amp currently not using w/ I downsized my system. It is a lovely amp and I will use it again. The AES DJH preamp is one of the best buudget preamps around. Id also look into the Rogue Metis, but it is not quite as detailed, but does have a phono stage.
I've though about Musical Fidelity for years but never took the plunge because there is some many brands to choose from. Please tell me about them. Is the integrated you have a bit harsh or thin as you are considering tube pre and MF amp?