I went through a very similar situation and ended up getting the RCM Sensor Prelude. It has the earthy 3-dimensional sound that people associate with great tube designs, the cleanliness of Einstein and rhythmic prowess of a Naim. It is a superb product IMO. There is one for sale at Agon right now, check it out.