recommend an upgrade from KEF Q90s

I really liked my KEF Q90s. They played reasonably loud, were reasonably accurate and I bought them dirt cheap in the early 90's. I have a 'high end' system with low powered tubes and only used the Q90s in the home theater system powered by Adcom amps. I enjoyed the Q90s when I needed more volume for heavy rock or hip-hop or anything the wee-power tube system couldn't handle. Sadly, the Q90 cabinets are falling apart, the drivers are buzzing on higher volumes, and I believe they are just 'done'.

I am thinking about building the Zaph audio Scanspeak revelator kit from Madisound, but I thought I would come here first and ask around. Someday I'd like to upgrade the Adcoms but they aren't too bad. When I do upgrade the Adcoms, I don't want to be wishing I spent more on speakers. So, what do you think I should do with a budget < $2,000 ? Thank you kindly for any recommendations.
-dave