Best of the small speakers

I'm looking for a small, preferably floorstanding speaker that will integrate well with my current system and room. My main source is a California Audio Labs CL-20 DVD/CD player, through a Rotel RC-995 preamp, into a McCormack DNA 0.5 Deluxe (which will be upgraded to Revision B by Steve McCormack himself in the very near future). My current speakers are Magnepan 1.6QRs. While I absolutely love many of the Maggies traits, they don't seem to integrate well into my fairly small listening space. As far out from the wall as I can move them, about 30 inches, I still get what sounds to me to be a fairly ragged frequency response. For reference, I have pretty electic listening tastes, from baroque to bebop to bluegrass, but the majority of my music is fairly complex, with many simultaneous melodic or rhythmic lines, on both acoustic and electric instuments. Accurate, timbrally-true bass is more far more important to me than rattling the windows. Any suggestions for speakers roughly in the Maggie's price range ($1500-$2500) which you feel would fit well into my system would be appreciated. Just trying to narrow down my shopping list. One speaker which has drawn my attention is the Thiel CS 1.5s, but I know there must be others I am missing! Thanks in advance for the help!!!