My suggestion may seem absurd, but it is based on your wide array of headphones. How about considering a $105 Qudelix 5k, having an excellent PEQ capability, bt, and a sufficient built-in amp (moreso when used balanced)?
You would use it as a front end most times to your THX889, only built-in...