Upgrading from Sony1000XM4

I’ve loved my XM4s, but they’ve been starting to have less and less time between charges and the power button is becoming unresponsive, so I’ve been looking to upgrade.

I recently tried the Sony XM6s and was pretty disappointed with the sound and fit. I also tried the Bowers and Wilkins PX7 S3, and while those were closer to what I was looking for, they still weren’t quite right. The Sony had good bass but everything almost sounded far away (maybe a bad pair?). The Bowers and Wilkins had less of a sound issue but the ANC just didn’t cut it.
I use my headphones everyday and wear them everywhere.l for a majority of my day. I love the noise cancellation and the bass driven sound of them. I use them to cancel out loud noises when I go out since I have sensitive hearing and everything sounds loud without my headphones muffling outside noise. I also listen to a lot of bass heavy music, (House, EDM, etc.) and love how the sound gets right in my ears.

The Sony XM4s have an EQ setting separate from the normal EQ adjuster called Clear Bass that lets you crank it up to have a stronger bass sound, which I’m thinking might be the reason I’m having a hard time finding a replacement.

I’ve heard good things about the Sennheiser Momentums, but am open to trying any suggestion. My target budget is around $500 but would be willing to pay more for a pair. Thank you!