Looking for amp advice (punk, rock & reggae edition)

My current amp isn’t doing it for me. Marantz pm6005 which is class D @45 wpc. Speakers are Focal Chorus 807V. It’s very detailed but a little clinical, my biggest gripe is a lack of midbass. According to Stereophile the impedance curve dives to 4 ohm between 100 and 200 hz which is where I think I the problem lies. All indications are that more power is needed to corrrct this which seems plausible as the more volume I give it the more it fills in in that range. The problem is that apartment living doesn’t allow 100db listening sessions.

So, I’m looking for an amplifier (separates or integrated) that has the current needed to round out the sound. The speakers are staying for many more years so replacing them isn’t a viable option, plus I love the sound.

Im interested in going tube but I have no experience with tubes. I have so many questions regarding tubes it could probably be it’s own thread but it seems to me that people love these more than SS on the whole. I’m open to any suggestions though.

My budget is $2500 (used ok but prefer new)

I listen to punk, post punk, lots of reggae (specifically dub), some electronic, a little jazz and some jangle pop (think REM).

Im looking for a warm side of neutral sound with good detail that can keep its composure with fast music yet be gentle enough for jazz. I like bass, if there’s an 808 or that dubby bass guitar, I want to hear it. These speakers do a nice job when the signal is right.

My analog front end is a PDC with a 2M Blue through a Lounge LCR MKIII. All interconnects are AQ Evergreen.

Thanks