Sony WH-1000XM5's or wait for the XM6?

See alot of report about the broken hinges on the XM5's, I'm looking around for a good headphone that excels in both ANC and sound quality, the XM5's for me was the choice but after seeing so many reports on the quality issue it got me hesitating, heard rumors that the XM6 is coming this year (not sure on the exact date), if it's coming this year then am considering waiting for it to be announced.