The problem here is something that sounds like Pass. Usually I recommend amps in contrast to Pass. While I'm a big fan of Class D I recommend them as not sounding like Pass to begin with.
How about an Ayre??? It's not a straight replacement, but it may be a good switch. :)