Upgrading path from Merlin VSM black magic


Goal:
I have been tinkering with the idea of upgrading and investing in floor standers that are superior in every way compared to Merlins. What are the Merlin users upgrading to? budget is 25k or under (used market value).
My present system:
I am using my Merlins VSM Black magic with dual BAMs with Coincident tech Frankenstein mono block amps (300B SET) and coincident tech line-state and phono preamp. Whole system is wired with Cardas clear cables. Using EMM XDS-1 and VPI classic turntable. System was built around Merlins. I suppose I might have to pick electronics suitable for the replacement speakers and in that case will build the whole system again. Preferably, I would like to keep the front end electronics/amps/pre-amp etc.
My music taste:
I listen mostly Jazz, Classical and vocals. 
My room:
I had Merlins setup in 12x16x8 room which was fully treated. I have since moved to a larger-ish space 15' x 21' x 9'. The room is not treated yet but would be fully treated with absorption panels/diffusors etc in the near future. I setup speakers with ears and with RoomEq software. 
Why not Merlins .. ??
I have thoroughly enjoyed Merlins but sometime feel it can sound a little thin and won't reach the lowest bass. Larger sound stage is desired. Full scale classical music can have better depth, width and weight. I have been using various versions of Merlins since 2009 and have the last version produced (Black magic) with dual BAMs. I have purchased two Funk Audio subwoofers that I have not integrated with the system yet. Merlin is not very subwoofer friendly anyways.
What I am looking for:
Ideal speakers would get from "Merlin" its neutral, resolving, transparent, low distortion, dynamic character. On top would also deliver fuller sound (top to bottom), be a full range down to 20Hz, provide bigger sound stage and has a more organic / relaxing sound (..better emotional connectivity). Speakers should be tube friendly, (preferably SET or OTL).
Brands:
There are simply too many out there. These brands come to mind: dynaudio, magico, sonus-faber, mbl, B&W, wilson audio, rockport, jm-labs, dunlavy, wilson benesch.  I am sure someone who has owned Merlins and made a move can give their input. Even a short list to audition would be helpful. I am based out of Orlando area. Would be great If any local member has a system that they can allow me to audition.
Past experience:
Other notable speakers I have owned in past include original Flocal Utopias (mezzo to grand Utopia), B&W nautilus series, Quad 989 among others. Yesterday's nautilus 800, 802 were power hungry and sounded boxy. This may not be the case with the newer models.  I feel like I am out of touch with what is out there. Have been out of market for long. 
Thanks.



celestial_audio
Thanks brf. I didn't think of removing BAM altogether. This seems simpler than I thought. I will give it a shot. Funk has one of the finest eq curves and digs deep. I never looked into coincident line and I would try to audition them. 
tubegroover. I could not agree more. Merlins are so perfect in every other way that it makes me nervous to change them and end with a different compromise. Funk seems like a logical path. 
Thanks.
The BBAM embellishes with augmentation well up into the mid-range region. You may find that removing it causes more problems than it solves. 
According to the manual, the BAM prvovides 5.2dB of boost at 35 Hz with a Subsonic bass roll-off below 27Hz.  Although Bobby M didn't like subs, he did recommend not using the BAM if using subs since the end user will be crossing the speakers over the effective range of the BAM. 

Audio Note AN/E it does everything you are looking for sounds great and is perfectly suited to your amps. Also well under your budget though you can upgrade internal parts and spend as much as you want. I have a pair of AN/J's on the way myself, the AN/E is a bit too large for my small room.
I have no doubt that the BBAM may effect subjective and measured performance of the speaker well into the midrange region. I’m not convinced removing it and adding a well integrated sub or better two would be a negative at least in my recent experiences with my current monitors where I noted a huge improvement across the board including the midrange and further improvement adding a 2nd sub well beyond anything gained by that BAM whether Berning's tube Bam  with 1k worth of premium VCAP and Vishays or Bobby's super BBAM. I only wish I tried a sub when I owned the Merlins, it may have been the answer to my frustration with that design aside from the positives.