Advice for dual-mode headphones (USB-C &Wireless)

Hello everyone! Trying my luck again to get some advice~

I’ve been looking for new headphones to replace my old WH-1000XM3, that were basically my first serious pair. Since I never owned wired headphones before but still would like to improve the audio quality, I wish to find a model that has both USB-C digital audio (USB-DAC mode) for calm, quality listening and Bluetooth/any kind of Wireless for when I’m moving around the house or when my devices are charging. 

Here are the details:

Budget: 300–500€ (EUR, in France). Prefer staying within this range; can stretch slightly if it clearly improves comfort/ANC/sound.

Source: iPhone (USB-C) most of the time, plus a Mac for work/listening. Streaming mainly Apple Music, I would like USB-C wired mode to support at least 24-bit/96 kHz.

Isolation: Some to a lot. I mainly listen at home and in cafés/libraries; occasional long trips (train/plane), so it matters but it’s not the top priority.

In public: Yes, regularly (see above).

Type: Full-sized over-ear headphones only.

Tonal balance: I honestly don’t have enough experience to answer clearly, so looking for an overall balanced sound with good detail. I wouldn’t be against trying for improved highs, but once again, no experience.

Past headphones: WH-1000XM3; never owned wired audiophile headphones before.

Music: Electronic, Dance, Folk, Classical music, but very eclectic overall.

Improve: overall quality, fidelity and details, especially when used wired, while keeping a good comfort and a decent ANC.

For now I have two models in mind :

• Shure AONIC 50 Gen 2 (348€/412$) 
• Sennheiser HDB 630 (499€/590$)

Since I can’t make a decision yet, any advice or other recommendations is more than welcome!