HDB 630 vs Sony 1000X THE COLLEXION – upgrading from WH-1000XM4

I’m looking to upgrade from my Sony WH-1000XM4 and I’m currently deciding between the Sennheiser HDB 630 and the new Sony 1000X THE COLLEXION.
Sound quality is my main priority, but I still want good ANC since I travel quite a lot. I listen to a lot of different music, but especially dub/reggae and bass-heavy music. I really like the warm and powerful bass of my XM4, and I definitely don’t want to lose that. Ideally, I’d actually like more/deeper sub-bass than the XM4, while getting a noticeable improvement in detail, clarity and soundstage.
The HDB 630 interests me because of the more audiophile-oriented sound, parametric EQ, USB-C lossless audio and the BTD 700 dongle. My only concern is whether I can EQ it to have seriously powerful, warm sub-bass without ruining the rest of the sound.
The 1000X THE COLLEXION also looks very interesting because I’m already used to Sony’s sound and ANC, but there isn’t nearly as much real-world information about it yet.

Has anyone compared these two, or upgraded from an XM4 to either of them?

Especially interested in opinions on:
Sub-bass extension and impact
How much bass the HDB 630 can handle with EQ
Overall sound quality/detail
Soundstage
ANC
Whether either one feels like a big upgrade from the XM4